diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index d3a58272b89..a6d2f0c9e69 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -21,7 +21,7 @@
 {
     "name" : "Accounting and Financial Management",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules/Accounting',
     "description": """Financial and accounting module that covers:
     General accountings
@@ -79,7 +79,7 @@ module named account_vouchers
         'wizard/account_invoice_state_view.xml',
         'wizard/account_partner_balance_report_view.xml',
         'wizard/account_balance_report_view.xml',
-        'wizard/account_move_line_select_view.xml',
+#        'wizard/account_move_line_select_view.xml',
         'wizard/account_aged_trial_balance_view.xml',
         'wizard/account_compare_account_balance_report_view.xml',
         'wizard/account_third_party_ledger.xml',
@@ -133,10 +133,10 @@ module named account_vouchers
         'test/chart_of_account.yml',
         'test/account_period_close.yml',
         'test/account_fiscalyear_close_state.yml',
-        'test/account_invoice_state.yml',
+        #'test/account_invoice_state.yml',
         'test/account_use_model.yml',
         'test/account_validate_account_move.yml',
-#        'test/account_fiscalyear_close.yml',
+        'test/account_fiscalyear_close.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/account/account.py b/addons/account/account.py
index 73e1fdd0b7e..2e7ce17196b 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -248,59 +248,59 @@ class account_account(osv.osv):
 
     def __compute(self, cr, uid, ids, field_names, arg=None, context=None,
                   query='', query_params=()):
-            """ compute the balance, debit and/or credit for the provided
-            account ids
-            Arguments:
-            `ids`: account ids
-            `field_names`: the fields to compute (a list of any of
-                           'balance', 'debit' and 'credit')
-            `arg`: unused fields.function stuff
-            `query`: additional query filter (as a string)
-            `query_params`: parameters for the provided query string
-                            (__compute will handle their escaping) as a
-                            tuple
-            """
-            mapping = {
-                'balance': "COALESCE(SUM(l.debit),0) " \
-                           "- COALESCE(SUM(l.credit), 0) as balance",
-                'debit': "COALESCE(SUM(l.debit), 0) as debit",
-                'credit': "COALESCE(SUM(l.credit), 0) as credit"
-            }
-            #get all the necessary accounts
-            children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
-            #compute for each account the balance/debit/credit from the move lines
-            accounts = {}
-            if children_and_consolidated:
-                aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
+        """ compute the balance, debit and/or credit for the provided
+        account ids
+        Arguments:
+        `ids`: account ids
+        `field_names`: the fields to compute (a list of any of
+                       'balance', 'debit' and 'credit')
+        `arg`: unused fields.function stuff
+        `query`: additional query filter (as a string)
+        `query_params`: parameters for the provided query string
+                        (__compute will handle their escaping) as a
+                        tuple
+        """
+        mapping = {
+            'balance': "COALESCE(SUM(l.debit),0) " \
+                       "- COALESCE(SUM(l.credit), 0) as balance",
+            'debit': "COALESCE(SUM(l.debit), 0) as debit",
+            'credit': "COALESCE(SUM(l.credit), 0) as credit"
+        }
+        #get all the necessary accounts
+        children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
+        #compute for each account the balance/debit/credit from the move lines
+        accounts = {}
+        if children_and_consolidated:
+            aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
 
-                wheres = [""]
-                if query.strip():
-                    wheres.append(query.strip())
-                if aml_query.strip():
-                    wheres.append(aml_query.strip())
-                filters = " AND ".join(wheres)
-                self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
-                                          'Filters: %s'%filters)
-                # IN might not work ideally in case there are too many
-                # children_and_consolidated, in that case join on a
-                # values() e.g.:
-                # SELECT l.account_id as id FROM account_move_line l
-                # INNER JOIN (VALUES (id1), (id2), (id3), ...) AS tmp (id)
-                # ON l.account_id = tmp.id
-                # or make _get_children_and_consol return a query and join on that
-                request = ("SELECT l.account_id as id, " +\
-                           ' , '.join(map(mapping.__getitem__, field_names)) +
-                           " FROM account_move_line l" \
-                           " WHERE l.account_id IN %s " \
-                                + filters +
-                           " GROUP BY l.account_id")
-                params = (tuple(children_and_consolidated),) + query_params
-                cr.execute(request, params)
-                self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
-                                          'Status: %s'%cr.statusmessage)
+            wheres = [""]
+            if query.strip():
+                wheres.append(query.strip())
+            if aml_query.strip():
+                wheres.append(aml_query.strip())
+            filters = " AND ".join(wheres)
+            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
+                                      'Filters: %s'%filters)
+            # IN might not work ideally in case there are too many
+            # children_and_consolidated, in that case join on a
+            # values() e.g.:
+            # SELECT l.account_id as id FROM account_move_line l
+            # INNER JOIN (VALUES (id1), (id2), (id3), ...) AS tmp (id)
+            # ON l.account_id = tmp.id
+            # or make _get_children_and_consol return a query and join on that
+            request = ("SELECT l.account_id as id, " +\
+                       ' , '.join(map(mapping.__getitem__, field_names)) +
+                       " FROM account_move_line l" \
+                       " WHERE l.account_id IN %s " \
+                            + filters +
+                       " GROUP BY l.account_id")
+            params = (tuple(children_and_consolidated),) + query_params
+            cr.execute(request, params)
+            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
+                                      'Status: %s'%cr.statusmessage)
 
-                for res in cr.dictfetchall():
-                    accounts[res['id']] = res
+            for res in cr.dictfetchall():
+                accounts[res['id']] = res
 
             # consolidate accounts with direct children
             children_and_consolidated.reverse()
@@ -656,9 +656,18 @@ class account_journal(osv.osv):
         @param context: context arguments, like lang, time zone
         @return: return a result
         """
+
+        journal_type = ('sale', 'sale_refund', 'purchase', 'purchase_refund')
+        journal_seq = {
+            'sale':'seq_out_invoice',
+            'purchase':'seq_in_invoice',
+            'purchase_refund':'seq_out_refund',
+            'sale_refund':'seq_in_refund'
+        }
         
         seq_pool = self.pool.get('ir.sequence')
         seq_typ_pool = self.pool.get('ir.sequence.type')
+        date_pool = self.pool.get('ir.model.data')
         
         result = True
         
@@ -685,10 +694,13 @@ class account_journal(osv.osv):
             res.update({
                 'sequence_id':seq_id
             })
-        
-        if not journal.invoice_sequence_id:
+
+        if journal.type in journal_type and not journal.invoice_sequence_id:
+            res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))])
+            inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id
+            inv_seq_id
             res.update({
-                'invoice_sequence_id':seq_id
+                'invoice_sequence_id':inv_seq_id
             })
         
         result = self.write(cr, uid, [journal.id], res)
@@ -1018,7 +1030,6 @@ class account_move(osv.osv):
             res.append((move.id, name))
         return res
 
-
     def _get_period(self, cr, uid, context):
         periods = self.pool.get('account.period').find(cr, uid)
         if periods:
@@ -1066,24 +1077,13 @@ class account_move(osv.osv):
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
         'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
         'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}),
-        'type': fields.selection([
-            ('pay_voucher','Cash Payment'),
-            ('bank_pay_voucher','Bank Payment'),
-            ('rec_voucher','Cash Receipt'),
-            ('bank_rec_voucher','Bank Receipt'),
-            ('cont_voucher','Contra'),
-            ('journal_sale_vou','Journal Sale'),
-            ('journal_pur_voucher','Journal Purchase'),
-            ('journal_voucher','Journal Voucher'),
-            ],'Entry Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}),
-        'narration':fields.text('Narration', readonly=True, select=True, states={'draft':[('readonly',False)]}),
+        'narration':fields.text('Narration', select=True),
         'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
     }
     _defaults = {
         'name': lambda *a: '/',
         'state': lambda *a: 'draft',
         'period_id': _get_period,
-        'type' : lambda *a : 'journal_voucher',
         'date': lambda *a:time.strftime('%Y-%m-%d'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
@@ -1116,6 +1116,7 @@ class account_move(osv.osv):
             'You cannot create entries on different periods/journals in the same move',
             ['line_id']),
     ]
+    
     def post(self, cr, uid, ids, context=None):
         if self.validate(cr, uid, ids, context) and len(ids):
             for move in self.browse(cr, uid, ids):
@@ -1162,8 +1163,20 @@ class account_move(osv.osv):
     # TODO: Check if period is closed !
     #
     def create(self, cr, uid, vals, context={}):
-        if 'line_id' in vals:
-            if 'journal_id' in vals:
+        if 'line_id' in vals and context.get('copy'):
+            for l in vals['line_id']:
+                if not l[0]:
+                    l[2].update({
+                        'reconcile_id':False,
+                        'reconcil_partial_id':False,
+                        'analytic_lines':False,
+                        'invoice':False,
+                        'ref':False,
+                        'balance':False,
+                        'account_tax_id':False,
+                    })
+            
+            if 'journal_id' in vals and vals.get('journal_id', False):
                 for l in vals['line_id']:
                     if not l[0]:
                         l[2]['journal_id'] = vals['journal_id']
@@ -1189,11 +1202,14 @@ class account_move(osv.osv):
             result = super(account_move, self).create(cr, uid, vals, context)
         return result
 
-    def copy(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        default = default.copy()
-        default.update({'state':'draft', 'name':'/',})
+    def copy(self, cr, uid, id, default={}, context={}):
+        default.update({
+            'state':'draft',
+            'name':'/',
+        })
+        context.update({
+            'copy':True
+        })
         return super(account_move, self).copy(cr, uid, id, default, context)
 
     def unlink(self, cr, uid, ids, context={}, check=True):
@@ -1604,13 +1620,44 @@ class account_tax(osv.osv):
         'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
 
     }
-    def search(self, cr, uid, args, offset=0, limit=None, order=None,
-            context=None, count=False):
+
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        """
+        Returns a list of tupples containing id, name, as internally it is called {def name_get}
+        result format : {[(id, name), (id, name), ...]}
+        
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param name: name to search 
+        @param args: other arguments
+        @param operator: default operator is 'ilike', it can be changed
+        @param context: context arguments, like lang, time zone
+        @param limit: Returns first 'n' ids of complete result, default is 80.
+        
+        @return: Returns a list of tupples containing id and name
+        """
+        if not args:
+            args=[]
+        if not context:
+            context={}
+        ids = []
+        ids = self.search(cr, user, args, limit=limit, context=context)
+        return self.name_get(cr, user, ids, context=context)
+    
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        journal_pool = self.pool.get('account.journal')
+        
         if context and context.has_key('type'):
-            if context['type'] in ('out_invoice','out_refund'):
-                args.append(('type_tax_use','in',['sale','all']))
-            elif context['type'] in ('in_invoice','in_refund'):
-                args.append(('type_tax_use','in',['purchase','all']))
+            if context.get('type') in ('out_invoice','out_refund'):
+                args += [('type_tax_use','in',['sale','all'])]
+            elif context.get('type') in ('in_invoice','in_refund'):
+                args += [('type_tax_use','in',['purchase','all'])]
+
+        if context and context.has_key('journal_id'):
+            journal = journal_pool.browse(cr, uid, context.get('journal_id'))
+            if journal.type in ('sale', 'purchase'):
+                args += [('type_tax_use','in',[journal.type,'all'])]
+        
         return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
 
     def name_get(self, cr, uid, ids, context={}):
@@ -1627,6 +1674,7 @@ class account_tax(osv.osv):
         if user.company_id:
             return user.company_id.id
         return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+        
     _defaults = {
         'python_compute': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or None\n# partner : res.partner object or None\n\nresult = price_unit * 0.10''',
         'python_compute_inv': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or False\n\nresult = price_unit * 0.10''',
@@ -1746,7 +1794,12 @@ class account_tax(osv.osv):
         tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
         for r in tin:
             totalex -= r['amount']
-        tex = self._compute(cr, uid, tex, totalex/quantity, quantity, address_id=address_id, product=product, partner=partner)
+        totlex_qty=0.0            
+        try:
+            totlex_qty=totalex/quantity
+        except:
+            pass    
+        tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner)
         for r in tex:
             totalin += r['amount']
         return {
@@ -2522,9 +2575,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                     'account_paid_id': acc_template_ref[value['account_paid_id']],
                 })
 
-        # Creating Journals
+        # Creating Journals Sales and Purchase
         vals_journal={}
-        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_view')])
+        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
         data = data_pool.browse(cr, uid, data_id[0])
         view_id = data.res_id
         
@@ -2556,6 +2609,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         vals_journal['type'] = 'purchase'
         vals_journal['code'] = _('EXJ')
         vals_journal['sequence_id'] = seq_id_purchase
+        vals_journal['view_id'] = view_id
 
         if obj_multi.chart_template_id.property_account_payable:
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
@@ -2567,12 +2621,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
         data = data_pool.browse(cr, uid, data_id[0])
         view_id_cash = data.res_id
-        #view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: why put  fix name
-        
+       
         data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
         data = data_pool.browse(cr, uid, data_id[0])
         ref_acc_bank = data.res_id
-        #ref_acc_bank = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fix name
         ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
 
         current_num = 1
@@ -2599,8 +2651,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
             if obj_multi.seq_journal:
                 vals_seq={
-                        'name': _('Bank Journal ') + vals['name'],
-                        'code': 'account.journal',
+                    'name': _('Bank Journal ') + vals['name'],
+                    'code': 'account.journal',
                 }
                 seq_id = obj_sequence.create(cr,uid,vals_seq)
 
@@ -2656,9 +2708,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             for position in obj_fiscal_position_template.browse(cr, uid, fp_ids):
 
                 vals_fp = {
-                           'company_id' : company_id,
-                           'name' : position.name,
-                           }
+                    'company_id' : company_id,
+                    'name' : position.name,
+                }
                 new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
 
                 obj_tax_fp = self.pool.get('account.fiscal.position.tax')
@@ -2666,19 +2718,28 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
                 for tax in position.tax_ids:
                     vals_tax = {
-                                'tax_src_id' : tax_template_ref[tax.tax_src_id.id],
-                                'tax_dest_id' : tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
-                                'position_id' : new_fp,
-                                }
+                        'tax_src_id' : tax_template_ref[tax.tax_src_id.id],
+                        'tax_dest_id' : tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
+                        'position_id' : new_fp,
+                    }
                     obj_tax_fp.create(cr, uid, vals_tax)
 
                 for acc in position.account_ids:
                     vals_acc = {
-                                'account_src_id' : acc_template_ref[acc.account_src_id.id],
-                                'account_dest_id' : acc_template_ref[acc.account_dest_id.id],
-                                'position_id' : new_fp,
-                                }
+                        'account_src_id' : acc_template_ref[acc.account_src_id.id],
+                        'account_dest_id' : acc_template_ref[acc.account_dest_id.id],
+                        'position_id' : new_fp,
+                    }
                     obj_ac_fp.create(cr, uid, vals_acc)
+        
+        #fially inactive the demo chart of accounts
+        data_id = data_pool.search(cr, uid, [('model','=','account.account'), ('name','=','chart0')])
+        if data_id:
+            data = data_pool.browse(cr, uid, data_id[0])
+            account_id = data.res_id
+            if account_id:
+                cr.execute("update account_account set active='f' where id=%s" % (account_id))
+        
 wizard_multi_charts_accounts()
 
 class account_bank_accounts_wizard(osv.osv_memory):
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index e0d31b9cf18..52e1b20a744 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -25,6 +25,7 @@ from osv import fields, osv
 
 from tools.misc import currency
 from tools.translate import _
+import decimal_precision as dp
 
 class account_bank_statement(osv.osv):
 
@@ -48,9 +49,16 @@ class account_bank_statement(osv.osv):
         }
 
     def _default_journal_id(self, cr, uid, context={}):
-        if context.get('journal_id', False):
-            return context['journal_id']
-        return False
+        journal_pool = self.pool.get('account.journal')
+        journal_type = context.get('journal_type', False)
+        journal_id = False
+        
+        if journal_type:
+            ids = journal_pool.search(cr, uid, [('type', '=', journal_type)])
+            if ids:
+                journal_id = ids[0]
+            
+        return journal_id 
 
     def _default_balance_start(self, cr, uid, context={}):
         cr.execute('select id from account_bank_statement where journal_id=%s order by date desc limit 1', (1,))
@@ -127,12 +135,12 @@ class account_bank_statement(osv.osv):
         'date': fields.date('Date', required=True,
             states={'confirm': [('readonly', True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True,
-            states={'confirm': [('readonly', True)]}, domain=[('type', '=', 'cash')]),
+            states={'confirm': [('readonly', True)]}, domain=[('type', '=', 'bank')]),
         'period_id': fields.many2one('account.period', 'Period', required=True,
             states={'confirm':[('readonly', True)]}),
-        'balance_start': fields.float('Starting Balance', digits=(16,2),
+        'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'),
             states={'confirm':[('readonly',True)]}),
-        'balance_end_real': fields.float('Ending Balance', digits=(16,2),
+        'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'),
             states={'confirm':[('readonly', True)]}),
         'balance_end': fields.function(_end_balance, method=True, string='Balance'),
         'line_ids': fields.one2many('account.bank.statement.line',
@@ -159,6 +167,32 @@ class account_bank_statement(osv.osv):
         'period_id': _get_period,
     }
 
+    def onchange_date(self, cr, user, ids, date, context={}):
+        """
+        Returns a dict that contains new values and context
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param date: latest value from user input for field date
+        @param args: other arguments
+        @param context: context arguments, like lang, time zone
+        @return: Returns a dict which contains new values, and context
+        """
+        res = {}
+        period_pool = self.pool.get('account.period')
+        pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
+        if pids:
+            res.update({
+                'period_id':pids[0]
+            })
+            context.update({
+                'period_id':pids[0]
+            })
+        
+        return {
+            'value':res,
+            'context':context,
+        }
+
     def button_confirm_bank(self, cr, uid, ids, context={}):
         done = []
         res_currency_obj = self.pool.get('res.currency')
@@ -334,6 +368,7 @@ class account_bank_statement(osv.osv):
 
                 if st.journal_id.entry_posted:
                     account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
+            self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)
             done.append(st.id)
         self.write(cr, uid, done, {'state':'confirm'}, context=context)
         return True
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 1a0727e626f..f618bcfeefd 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -25,6 +25,7 @@ import time
 from mx import DateTime
 from decimal import Decimal
 from tools.translate import _
+import decimal_precision as dp
 
 class account_cashbox_line(osv.osv):
     
@@ -55,9 +56,9 @@ class account_cashbox_line(osv.osv):
         return {'value':{'subtotal': sub or 0.0}}
 
     _columns = {
-        'pieces': fields.float('Values', digits=(16,2)),
+        'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')),
         'number': fields.integer('Number'),
-        'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float',digits=(16,2)),
+        'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')),
         'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
         'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
      }
@@ -117,18 +118,18 @@ class account_cash_statement(osv.osv):
             res2[statement.id]=encoding_total
         return res2
 
-    def _default_journal_id(self, cr, uid, context={}):
+#    def _default_journal_id(self, cr, uid, context={}):
 
-        """ To get default journal for the object" 
-        @param name: Names of fields.
-        @return: journal 
-        """
-        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-        journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
-        if journal:
-            return journal[0]
-        else:
-            return False
+#        """ To get default journal for the object" 
+#        @param name: Names of fields.
+#        @return: journal 
+#        """
+#        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+#        journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
+#        if journal:
+#            return journal[0]
+#        else:
+#            return False
     
     def _end_balance(self, cursor, user, ids, name, attr, context=None):
         res_currency_obj = self.pool.get('res.currency')
@@ -173,10 +174,32 @@ class account_cash_statement(osv.osv):
         
         return company_id
 
+    def _get_cash_open_box_lines(self, cr, uid, ids, context={}):
+        res = []
+        curr = [1, 2, 5, 10, 20, 50, 100, 500]
+        for rs in curr:
+            dct = {
+                'pieces':rs,
+                'number':0
+            }
+            res.append(dct)
+        return res
+
+    def _get_cash_close_box_lines(self, cr, uid, ids, context={}):
+        res = []
+        curr = [1, 2, 5, 10, 20, 50, 100, 500]
+        for rs in curr:
+            dct = {
+                'pieces':rs,
+                'number':0
+            }
+            res.append((0, 0, dct))
+        return res
+        
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=False),
-        'journal_id': fields.many2one('account.journal', 'Journal', required=True),
-        'balance_end_real': fields.float('Closing Balance', digits=(16,2), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True, domain=[('type', '=', 'cash')]),
+        'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
         'state': fields.selection(
             [('draft', 'Draft'),
             ('confirm', 'Confirm'),
@@ -194,26 +217,36 @@ class account_cash_statement(osv.osv):
         'state': lambda *a: 'draft',
         'name': lambda *a: '/',
         'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
-        'journal_id': _default_journal_id,
         'user_id': lambda self, cr, uid, context=None: uid,
-        'company_id': _get_company
+        'company_id': _get_company,
+        'starting_details_ids':_get_cash_open_box_lines,
+        'ending_details_ids':_get_cash_open_box_lines
      }
 
     def create(self, cr, uid, vals, context=None):
         company_id = vals and vals.get('company_id',False)
         if company_id:
-            open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
+            sql = [
+                ('company_id', '=', vals['company_id']), 
+                ('journal_id', '=', vals['journal_id']), 
+                ('state', '=', 'open')
+            ]
+            open_jrnl = self.search(cr, uid, sql)
             if open_jrnl:
-                raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
-            if 'starting_details_ids' in vals:
-                vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
-                for i in starting_details_ids:
-                    if i and i[0] and i[1]:
-                        i[0], i[1] = 0, 0
+                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':
+            lines = end_lines = self._get_cash_close_box_lines(cr, uid, [], context)
+            vals.update({
+                'ending_details_ids':lines
+            })
+        else:
+            vals.update({
+                'ending_details_ids':False,
+                'starting_details_ids':False
+            })
         res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
-        res = self._get_starting_balance(cr, uid, [res_id])
-        for rs in res:
-            super(account_cash_statement, self).write(cr, uid, rs, res.get(rs))
+        self.write(cr, uid, [res_id], {})
         return res_id
     
     def write(self, cr, uid, ids, vals, context=None):
@@ -283,27 +316,26 @@ class account_cash_statement(osv.osv):
         
         number = self.pool.get('ir.sequence').get(cr, uid, statement.journal_id.sequence_id.code)
         
-        if len(statement.starting_details_ids) > 0:
-            sid = []
-            for line in statement.starting_details_ids:
-                sid.append(line.id)
-            
-            cash_pool.unlink(cr, uid, sid)
-        
-        cr.execute("select id from account_bank_statement where journal_id=%s and user_id=%s and state=%s order by id desc limit 1", (statement.journal_id.id, uid, 'confirm'))
-        rs = cr.fetchone()
-        rs = rs and rs[0] or None
-        if rs:
-            statement = statement_pool.browse(cr, uid, rs)
-            balance_start = statement.balance_end_real or 0.0
-            open_ids = cash_pool.search(cr, uid, [('ending_id','=',statement.id)])
-            for sid in open_ids:
-                default = {
-                    'ending_id': False,
-                    'starting_id':ids[0]
-                }
-                cash_pool.copy(cr, uid, sid, default)
-            
+#        if len(statement.starting_details_ids) > 0:
+#            sid = []
+#            for line in statement.starting_details_ids:
+#                sid.append(line.id)
+#            cash_pool.unlink(cr, uid, sid)
+#        
+#        cr.execute("select id from account_bank_statement where journal_id=%s and user_id=%s and state=%s order by id desc limit 1", (statement.journal_id.id, uid, 'confirm'))
+#        rs = cr.fetchone()
+#        rs = rs and rs[0] or None
+#        if rs:
+#            statement = statement_pool.browse(cr, uid, rs)
+#            balance_start = statement.balance_end_real or 0.0
+#            open_ids = cash_pool.search(cr, uid, [('ending_id','=',statement.id)])
+#            for sid in open_ids:
+#                default = {
+#                    'ending_id': False,
+#                    'starting_id':ids[0]
+#                }
+#                cash_pool.copy(cr, uid, sid, default)
+#            
         vals = {
             'date':time.strftime("%Y-%m-%d %H:%M:%S"), 
             'state':'open',
diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml
index ee2ad952e6a..fe7b6e682fe 100644
--- a/addons/account/account_end_fy.xml
+++ b/addons/account/account_end_fy.xml
@@ -8,6 +8,7 @@
             <field name="view_type">form</field>
             <field name="domain">[('state','=','draft')]</field>
             <field name="view_id" ref="view_account_period_tree"/>
+            <field name="help"> After closing a period, you will no longer be able to post entries to the period once it has been closed.</field>
         </record>
         <menuitem
             action="action_account_period_tree"
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 0bce735f1b3..479f9bf1c65 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -60,6 +60,8 @@
                 <field name="account_payment"/>
                 <field name="account_followup"/>
                 <field name="account_asset"/>
+                <field name="account_voucher"/>
+                <field name="account_voucher_payment"/>
             </group>
           </group>
           </group>
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 99d1181fb7b..22df9059305 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -5,7 +5,6 @@
         <!--
         Invoices
         -->
-
         <record id="view_invoice_line_calendar" model="ir.ui.view">
             <field name="name">account.invoice.calendar</field>
             <field name="model">account.invoice</field>
@@ -17,6 +16,7 @@
                 </calendar>
             </field>
         </record>
+        
         <record model="ir.ui.view" id="view_invoice_graph">
             <field name="name">account.invoice.graph</field>
             <field name="model">account.invoice</field>
@@ -28,6 +28,7 @@
                 </graph>
             </field>
         </record>
+        
         <record id="view_invoice_line_tree" model="ir.ui.view">
             <field name="name">account.invoice.line.tree</field>
             <field name="model">account.invoice.line</field>
@@ -44,6 +45,7 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_invoice_line_form" model="ir.ui.view">
             <field name="name">account.invoice.line.form</field>
             <field name="model">account.invoice.line</field>
@@ -74,6 +76,7 @@
                 </form>
             </field>
         </record>
+        
         <record id="view_invoice_tax_tree" model="ir.ui.view">
             <field name="name">account.invoice.tax.tree</field>
             <field name="model">account.invoice.tax</field>
@@ -89,6 +92,7 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_invoice_tax_form" model="ir.ui.view">
             <field name="name">account.invoice.tax.form</field>
             <field name="model">account.invoice.tax</field>
@@ -115,7 +119,7 @@
             <field name="model">account.invoice</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state not in ('draft')" string="Invoice">
+                <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('paid','cancel')" string="Invoice">
                     <field name="date_invoice"/>
                     <field name="number"/>
                     <field name="partner_id" groups="base.group_user"/>
@@ -131,6 +135,12 @@
                     <field name="amount_untaxed" sum="Untaxed Amount"/>
                     <field name="amount_total" sum="Total Amount"/>
                     <field name="state"/>
+
+                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
+                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
                 </tree>
             </field>
         </record>
@@ -147,9 +157,9 @@
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-                        <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change"/>
+                        <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}"/>
                         <newline/>
-                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
+                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
@@ -201,18 +211,18 @@
                                 <field name="amount_total"/>
                                 <field name="state"/>
                                 <field name="residual"/>
-                                <group col="3" colspan="4">
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="terp-camera_test"/>
+                                <group col="6" colspan="4">
+                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
                                     <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="terp-gtk-stop"/>
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="terp-dolar"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                 </group>
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)"/>
+                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
 
                             <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             <newline/>
@@ -245,7 +255,6 @@
             </field>
         </record>
 
-
         <record id="invoice_form" model="ir.ui.view">
             <field name="name">account.invoice.form</field>
             <field name="model">account.invoice</field>
@@ -257,9 +266,9 @@
                     <field name="number"/>
                     <field name="type" invisible="1"/>
                     <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change"/>
+                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}"/>
                     <newline/>
-                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user"/>
+                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
                     <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                     <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                     <newline/>
@@ -295,14 +304,14 @@
                                 <field name="amount_total"/>
                                 <field name="state"/>
                                 <field name="residual"/>
-                                <group col="4" colspan="4" groups="base.group_user">
+                                <group col="7" colspan="4" groups="base.group_user">
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-check"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-document-new"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
                                     <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
+                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="gtk-execute"/>
                                 </group>
                             </group>
                         </page>
@@ -312,7 +321,7 @@
                             <field name="date_due"/>
                             <field name="user_id"/>
                             <newline/>
-                            <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank"
+                            <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"
                                 groups="base.group_extended"/>
                             <field name="origin"/>
                             <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"
@@ -349,7 +358,7 @@
                    <group col="10" colspan="4">
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                         <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
-                        <filter icon="terp-check" string="Invoices" domain="[('state','not in',['draft','cancel','cancel'])]" help="Invoices"/>
+                        <filter icon="terp-check" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Invoices"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
@@ -362,6 +371,11 @@
                         <field name="amount_total"/>
                     </group>
                     <newline/>
+                    <group col="10" colspan="4">
+                        <field name="journal_id" widget="selection" select='1'/>
+                        <field name="period_id" select='1'/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
@@ -403,6 +417,7 @@
             <field name="view_mode">tree</field>
             <field name="act_window_id" ref="action_invoice_tree"/>
         </record>
+        
         <record id="action_invoice_tree_view2" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
@@ -420,12 +435,15 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
+            <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
         </record>
+        
         <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="act_window_id" ref="action_invoice_tree1"/>
         </record>
+        
         <record id="action_invoice_tree1_view2" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
@@ -443,6 +461,7 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
+            <field name="help">Proposal for vendor invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
@@ -455,6 +474,7 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
+            <field name="help">A customer refund is a credit note to your customer that cancel  invoice or a part of it.</field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@@ -469,7 +489,6 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree3"/>
         </record>
-
         <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree4" model="ir.actions.act_window">
@@ -481,6 +500,7 @@
             <field name="domain">[('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
+            <field name="help">A vendor refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you.</field>
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index 4c919765596..ba8d1ba2bc8 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -12,17 +12,19 @@
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
+        
         <!--        <record model="workflow.activity" id="act_confirm">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">confirm</field>
         </record> -->
-        <record id="act_proforma" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">proforma</field>
-            <field name="action">action_move_create()
-write({'state':'proforma'})</field>
-            <field name="kind">function</field>
-        </record>
+        
+<!--        <record id="act_proforma" model="workflow.activity">-->
+<!--            <field name="wkf_id" ref="wkf"/>-->
+<!--            <field name="name">proforma</field>-->
+<!--            <field name="action">action_move_create()-->
+<!--write({'state':'proforma'})</field>-->
+<!--            <field name="kind">function</field>-->
+<!--        </record>-->
 
         <record id="act_proforma2" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
@@ -42,7 +44,7 @@ write({'state':'open'})</field>
         </record>
         <record model="workflow.activity" id="act_open_test">
             <field name="wkf_id" ref="wkf"/>
-            <field name="name">open</field>
+            <field name="name">re-open</field>
             <field name="action">write({'state':'open'})</field>
             <field name="kind">function</field>
            </record>
@@ -70,28 +72,28 @@ write({'state':'cancel'})</field>
         </record>
         -->
 
-        <record id="t3" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_proforma"/>
-            <field name="signal">invoice_proforma</field>
-        </record>
+<!--        <record id="t3" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_draft"/>-->
+<!--            <field name="act_to" ref="act_proforma"/>-->
+<!--            <field name="signal">invoice_proforma</field>-->
+<!--        </record>-->
         <record id="t4" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_open"/>
             <field name="signal">invoice_open</field>
         </record>
-        <record id="t5" model="workflow.transition">
-            <field name="act_from" ref="act_proforma"/>
-            <field name="act_to" ref="act_open"/>
-            <field name="signal">invoice_open</field>
-        </record>
-        <record id="t7" model="workflow.transition">
-            <field name="act_from" ref="act_proforma"/>
-            <field name="act_to" ref="act_paid"/>
-            <field name="trigger_model">account.move.line</field>
-            <field name="trigger_expr_id">move_line_id_payment_get()</field>
-            <field name="condition">test_paid()</field>
-        </record>
+<!--        <record id="t5" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_proforma"/>-->
+<!--            <field name="act_to" ref="act_open"/>-->
+<!--            <field name="signal">invoice_open</field>-->
+<!--        </record>-->
+<!--        <record id="t7" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_proforma"/>-->
+<!--            <field name="act_to" ref="act_paid"/>-->
+<!--            <field name="trigger_model">account.move.line</field>-->
+<!--            <field name="trigger_expr_id">move_line_id_payment_get()</field>-->
+<!--            <field name="condition">test_paid()</field>-->
+<!--        </record>-->
         <record id="t8" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_paid"/>
@@ -104,11 +106,11 @@ write({'state':'cancel'})</field>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">invoice_cancel</field>
         </record>
-        <record id="t11" model="workflow.transition">
-            <field name="act_from" ref="act_proforma"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">invoice_cancel</field>
-        </record>
+<!--        <record id="t11" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_proforma"/>-->
+<!--            <field name="act_to" ref="act_cancel"/>-->
+<!--            <field name="signal">invoice_cancel</field>-->
+<!--        </record>-->
         <record id="t12" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_cancel"/>
@@ -124,7 +126,15 @@ write({'state':'cancel'})</field>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">invoice_cancel</field>
         </record>
-
+        
+        <record id="open_test_to_paid" model="workflow.transition">
+            <field name="act_from" ref="act_open_test"/>
+            <field name="act_to" ref="act_paid"/>
+            <field name="trigger_model">account.move.line</field>
+            <field name="trigger_expr_id">move_line_id_payment_get()</field>
+            <field name="condition">test_paid()</field>
+        </record>
+        
         <record id="draft_to_pro2" model="workflow.transition">
             <field name="act_from" ref="account.act_draft"/>
             <field name="act_to" ref="act_proforma2"/>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index e0ac10abb50..58cc997a111 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -8,24 +8,23 @@
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
 <!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
         <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
-            <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing"/>
-            <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
+        <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing"/>
+        <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
-            <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
+        <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
         <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
-            <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
-            <menuitem id="menu_generic_report" name="Management Reports" parent="menu_finance_reporting"/>
-            <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
-            <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13"/>
-            <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
-            <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
-                <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
-                <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
-            <menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
-                <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
+        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
+        <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
+        <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
+        <menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
+        <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
 <!--        <menuitem id="menu_finance_configuration1" name="Configuration" parent="menu_finance" sequence="80"/>-->
 <!--        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>-->
 <!--        <menuitem id="menu_finance_accounting1" name="Financial Accounting" parent="menu_finance_configuration" sequence="80"/>-->
@@ -34,10 +33,9 @@
 <!--        <menuitem id="menu_finance_reporting11" name="Reporting" parent="account.menu_finance"  sequence="80"/>-->
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
 <!--        <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
-<!--        <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>-->
 
         <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
-            groups="group_account_user"/>
+        groups="group_account_user"/>
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"/>
 
 <!--        <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
@@ -45,7 +43,18 @@
 <!--            groups="group_account_user"/>-->
         <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing"/>
 
-       <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
+        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
+
+        <menuitem 
+        parent="account.menu_finance_legal_statement" 
+        id="final_accounting_reports"
+        name="Accounting Reports"/>
+
+        <menuitem 
+        parent="account.menu_finance_legal_statement" 
+        id="menu_journals_report"
+        name="Journals"/>
+
     </data>
 </openerp>
 
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index bf12bdc2087..079ad00de0d 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -20,7 +20,6 @@
 ##############################################################################
 import time
 from datetime import datetime
-
 import netsvc
 from osv import fields, osv
 from tools.translate import _
@@ -183,7 +182,7 @@ class account_move_line(osv.osv):
         # Compute the current move
         move_id = False
         partner_id = False
-        if context.get('journal_id',False) and context.get('period_id',False):
+        if context.get('journal_id', False) and context.get('period_id', False):
             if 'move_id' in fields:
                 cr.execute('select move_id \
                     from \
@@ -199,6 +198,7 @@ class account_move_line(osv.osv):
                     return data
                 else:
                     data['move_id'] = move_id
+
             if 'date' in fields:
                 cr.execute('select date  \
                     from \
@@ -214,7 +214,6 @@ class account_move_line(osv.osv):
                     period = period_obj.browse(cr, uid, context['period_id'],
                             context=context)
                     data['date'] = period.date_start
-
         if not move_id:
             return data
 
@@ -401,7 +400,7 @@ class account_move_line(osv.osv):
         'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
         'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", states={'valid':[('readonly',True)]}, help="The move of this entry line.", select=2),
-
+        'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Narration'),
         'ref': fields.char('Ref.', size=64),
         'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
         'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
@@ -454,6 +453,7 @@ class account_move_line(osv.osv):
                         context=context)
                 dt = period.date_start
         return dt
+        
     def _get_currency(self, cr, uid, context={}):
         if not context.get('journal_id', False):
             return False
@@ -786,6 +786,31 @@ class account_move_line(osv.osv):
             return j+(p and (':'+p) or '')
         return False
 
+#    def onchange_date(self, cr, user, ids, date, context={}):
+#        """
+#        Returns a dict that contains new values and context
+#        @param cr: A database cursor
+#        @param user: ID of the user currently logged in
+#        @param date: latest value from user input for field date
+#        @param args: other arguments
+#        @param context: context arguments, like lang, time zone
+#        @return: Returns a dict which contains new values, and context
+#        """
+#        res = {}
+#        period_pool = self.pool.get('account.period')
+#        pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
+#        if pids:
+#            res.update({
+#                'period_id':pids[0]
+#            })
+#            context.update({
+#                'period_id':pids[0]
+#            })
+#        return {
+#            'value':res,
+#            'context':context,
+#        }
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
         result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar, submenu=submenu)
         if view_type != 'tree':
@@ -794,7 +819,7 @@ class account_move_line(osv.osv):
         fld = []
         fields = {}
         flds = []
-        title = self.view_header_get(cr, uid, view_id, view_type, context)
+        title = "Accounting Entries" #self.view_header_get(cr, uid, view_id, view_type, context)
         xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write">\n\t''' % (title)
         journal_pool = self.pool.get('account.journal')
 
@@ -849,16 +874,14 @@ class account_move_line(osv.osv):
                 attrs.append('sum="Total credit"')
             elif field == 'account_tax_id':
                 attrs.append('domain="[(\'parent_id\',\'=\',False)]"')
+                attrs.append("context=\"{'journal_id':journal_id}\"")
             elif field == 'account_id' and journal.id:
                 attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'&lt;&gt;\',\'view\'), (\'type\',\'&lt;&gt;\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
             elif field == 'partner_id':
                 attrs.append('on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"')
-#            if field.readonly:
-#                attrs.append('readonly="1"')
-#            if field.required:
-#                attrs.append('required="1"')
-#            else:
-#                attrs.append('required="0"')
+            elif field == 'journal_id':
+                attrs.append("context=\"{'journal_id':journal_id}\"")
+
             if field in ('amount_currency','currency_id'):
                 attrs.append('on_change="onchange_currency(account_id, amount_currency,currency_id, date, journal_id)"')
 
@@ -898,6 +921,7 @@ class account_move_line(osv.osv):
     def _check_date(self, cr, uid, vals, context=None, check=True):
         if context is None:
             context = {}
+        journal_id = False
         if 'date' in vals.keys():
             if 'journal_id' in vals and 'journal_id' not in context:
                 journal_id = vals['journal_id']
@@ -1082,10 +1106,10 @@ class account_move_line(osv.osv):
 
         #if not 'currency_id' in vals:
         #    vals['currency_id'] = account.company_id.currency_id.id
-
+        
         result = super(osv.osv, self).create(cr, uid, vals, context)
         # CREATE Taxes
-        if vals.get('account_tax_id',False):
+        if vals.get('account_tax_id', False):
             tax_id = tax_obj.browse(cr, uid, vals['account_tax_id'])
             total = vals['debit'] - vals['credit']
             if journal.refund_journal:
@@ -1158,7 +1182,7 @@ class account_move_line(osv.osv):
         if check and ((not context.get('no_store_function')) or journal.entry_posted):
             tmp = self.pool.get('account.move').validate(cr, uid, [vals['move_id']], context)
             if journal.entry_posted and tmp:
-                self.pool.get('account.move').button_validate(cr,uid, [vals['move_id']],context)
+                rs = self.pool.get('account.move').button_validate(cr,uid, [vals['move_id']],context)
         return result
 account_move_line()
 
diff --git a/addons/account/account_unit_test.xml b/addons/account/account_unit_test.xml
index 77b461a6fdd..97fba380214 100644
--- a/addons/account/account_unit_test.xml
+++ b/addons/account/account_unit_test.xml
@@ -52,6 +52,8 @@
             <!-- writeoff_acc_id = -->        <value eval="ref('cash')"/>
             <!-- writeoff_period_id = -->    <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
             <!-- writeoff_journal_id = -->    <value eval="ref('bank_journal')"/>
+            <!-- context = -->              <value eval="{}"/>
+            <!-- name = -->                 <value eval="str('Payment from ASUStek')"/>
         </function>
         
         <assert id="test_invoice_1" model="account.invoice" string="Test invoice 1 is now paid">
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 78cb6cadd7e..ac2440cd5d6 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -44,7 +44,7 @@
             <field name="model">account.fiscalyear</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Fiscalyear">
+                <tree colors="blue:state in ('draft');gray:state in ('done') " string="Fiscalyear">
                     <field name="code"/>
                     <field name="name"/>
                     <field name="state"/>
@@ -113,7 +113,7 @@
             <field name="model">account.period</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Period">
+            	<tree colors="blue:state in ('draft');gray:state in ('done') " string="Period">
                     <field name="code"/>
                     <field name="name"/>
                     <field name="date_start"/>
@@ -152,12 +152,16 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <newline/>
-                            <field name="currency_id"/>
-                            <field name="active"/>
-                            <field name="currency_mode"/>
-                            <field name="reconcile"/>
-                            <newline/>
+                            <group col="2" colspan="2">
+                                <separator string="Currency" colspan="2"/>
+                                <field name="currency_id"/>
+                                <field name="currency_mode" attrs="{'readonly': [('currency_id','=',False)]}"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Reconcile" colspan="2"/>
+                                <field name="reconcile"/>
+<!--                                <field name="active"/>-->
+                            </group>
                             <separator string="Default Taxes" colspan="4"/>
                             <field colspan="4" name="tax_ids" nolabel="1" domain="[('parent_id','=',False)]"/>
                             <separator string="Consolidated Children" colspan="4"/>
@@ -197,12 +201,32 @@
             </field>
         </record>
 
+        <record id="view_account_list" model="ir.ui.view">
+            <field name="name">account.account.list</field>
+            <field name="model">account.account</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_id</field>
+            <field name="arch" type="xml">
+                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" >
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="user_type" invisible="1"/>
+                    <field name="debit"/>
+                    <field name="credit"/>
+                    <field name="balance"/>
+                    <field name="type"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_currency_id"/>
+                </tree>
+            </field>
+        </record>
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="view_account_search"/>
+            <field name="view_id" ref="view_account_list"/>
         </record>
         <menuitem id="account_account_menu" name="Accounts" parent="menu_finance_accounting"/>
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
@@ -213,17 +237,15 @@
             <field name="type">tree</field>
             <field name="field_parent">child_id</field>
             <field name="arch" type="xml">
-                <tree string="Chart of accounts" toolbar="1" colors="blue:type in ('view');black:type not in ('view')">
+                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" >
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="parent_id" invisible="1"/>
-                    <field name="user_type" invisible="1"/>
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="company_currency_id"/>
-                    <field name="type" invisible="1"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
@@ -237,10 +259,10 @@
 <!--        <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>-->
 
         <!--
-    Journal
+        Journal
 
-    Account Journal Columns
-    -->
+        Account Journal Columns
+        -->
 
         <record id="view_journal_column_form" model="ir.ui.view">
             <field name="name">account.journal.column.form</field>
@@ -251,9 +273,9 @@
                     <field colspan="4" name="name" select="1"/>
                     <field name="field" select="1"/>
                     <field name="sequence"/>
-                    <newline/>
-                    <field name="readonly"/>
-                    <field name="required"/>
+<!--                    <newline/>-->
+<!--                    <field name="readonly"/>-->
+<!--                    <field name="required"/>-->
                 </form>
             </field>
         </record>
@@ -265,8 +287,8 @@
                 <tree string="Journal Column">
                     <field name="sequence"/>
                     <field name="name"/>
-                    <field name="required"/>
-                    <field name="readonly"/>
+<!--                    <field name="required"/>-->
+<!--                    <field name="readonly"/>-->
                 </tree>
             </field>
         </record>
@@ -277,11 +299,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal View">
-                    <field colspan="4" name="name" select="1"/>
+                    <field name="name" select="1"/>
                     <field colspan="4" name="columns_id" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
         </record>
+        <record id="action_account_journal_view" model="ir.actions.act_window">
+            <field name="name">Journal Views</field>
+            <field name="res_model">account.journal.view</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem action="action_account_journal_view" id="menu_action_account_journal_view" parent="account.menu_low_level"/>
 
         <!--
     # Account Journal
@@ -347,7 +376,7 @@
                                     <field name="view_id" widget="selection"/>
                                 </group>
                             </group>
-                            
+
                             <group colspan="2" col="2">
                                 <separator string="Company" colspan="4"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
@@ -365,7 +394,7 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Invoicing Data" colspan="4"/>
-                                <field name="invoice_sequence_id" groups="base.group_extended"/>
+                                <field name="invoice_sequence_id"/>
                                 <field name="group_invoice_lines"/>
                             </group>
                             <group colspan="2" col="2" groups="base.group_extended">
@@ -396,18 +425,20 @@
             <field name="model">account.bank.statement</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Statement">
-                   <group col="10" colspan="4">
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Statement"/>
-                        <filter icon="terp-check" string="Posted" domain="[('state','=','confirm')]" help="Confirm confirm"/>
+                <search string="Search Bank Statements">
+                    <group col="8" colspan="4">
+                        <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                        <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
                         <field name="date"/>
+                        <field name="name"/>
                         <field name="journal_id"/>
                     </group>
-                    <group expand="0" string="Group By..." colspan="12" col="10">
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
+                        <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
+                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
             </field>
@@ -419,17 +450,17 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:balance_end_real!=balance_end and state=='draft';blue:state=='draft' and (balance_end_real==balance_end);black:state=='confirm'" string="Statement">
-                    <field name="date"/>
                     <field name="name"/>
-                    <field name="journal_id"/>
+                    <field name="date"/>
                     <field name="period_id"/>
+                    <field name="journal_id"/>
                     <field name="balance_start"/>
                     <field name="balance_end_real"/>
                     <field name="balance_end"/>
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
                     <button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
@@ -439,13 +470,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
-                    <group>
+                    <group col="8" colspan="4">
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
+                        <field name="journal_id" widget="selection"/>      
                         <field name="date"/>
                         <field name="name"/>
-                        <field name="journal_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -464,8 +495,8 @@
                 <form string="Bank Statement">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="date" select="1"/>
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
+                        <field name="date" select="1" on_change="onchange_date(date)"/>
+                        <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" select="1"/>
                         <field name="period_id"/>
                         <field name="balance_start"/>
                         <field name="balance_end_real"/>
@@ -504,12 +535,16 @@
                             <field colspan="4" name="move_line_ids" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="7" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
+                        
+                        <button name="%(action_view_account_statement_from_invoice_lines)d"
+                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}"/>
+                        
                         <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="terp-gtk-stop"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -518,8 +553,9 @@
             <field name="name">Bank Statements</field>
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('journal_id.type', '=', 'bank')]</field>
+            <field name="context">{'journal_type':'bank'}</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_bank_statement_tree_bank">
             <field name="sequence" eval="1"/>
@@ -544,12 +580,12 @@
             <field name="filter" eval="True"/>
         </record>
 
-        <record id="action_bank_statement_tree2" model="ir.actions.act_window">
-            <field name="name">New Statement</field>
-            <field name="res_model">account.bank.statement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-        </record>
+<!--        <record id="action_bank_statement_tree2" model="ir.actions.act_window">-->
+<!--            <field name="name">New Statement</field>-->
+<!--            <field name="res_model">account.bank.statement</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">form,tree</field>-->
+<!--        </record>-->
 
         <record id="view_bank_statement_reconcile" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
@@ -638,14 +674,14 @@
             <field name="model">account.move</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Accounting Entries">
+                <tree colors="blue:state in ('draft');black:state in ('posted')" string="Accounting Entries">
                     <field name="name"/>
                     <field name="date"/>
                     <field name="ref"/>
                     <field name="period_id"/>
                     <field name="journal_id"/>
                     <field name="partner_id"/>
-                    <field name="amount"/>
+                    <field name="amount" sum="Total Amount"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -792,7 +828,7 @@
                             <field groups="base.group_extended" name="price_include"/>
                             <field name="type_tax_use"/>
                             <newline/>
-                            <field colspan="4" groups="base.group_extended" name="child_ids"/>
+                            <field colspan="4" groups="base.group_extended" name="child_ids" nolabel="1"/>
                         </page>
                         <page string="Tax Declaration">
                             <separator colspan="4" string="Invoices"/>
@@ -832,6 +868,7 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_tax_code_tree"/>
+            <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
         </record>
         <menuitem
             action="action_tax_code_tree"
@@ -850,7 +887,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Account Entry Line" editable="top" on_write="on_create_write">
+                <tree colors="blue:state in ('draft');black:state in ('valid')" string="Account Entry Line" editable="top" on_write="on_create_write">
                     <field name="date"/>
                     <field name="period_id"/>
                     <field name="move_id"/>
@@ -880,43 +917,70 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Account Entry Line">
-                    <notebook>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="ref"/>
+                        <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                        
+                        <field name="journal_id"/>
+                        <field name="period_id"/>
+                        <field name="company_id" required="1" groups="base.group_multi_company"/>
+                    </group>
+                    <notebook colspan="4">
                         <page string="Information">
-                            <separator colspan="4" string="General Information"/>
-                            <field name="name" select="1"/>
-                            <field name="date" select="1"/>
-                            <field name="ref"/>
-                            <field name="invoice"/>
-                            <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Amount"/>
+                                <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                <field name="debit"/>
+                                <field name="credit"/>
+                                <field name="quantity"/>
+                            </group>
+                            
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Accounting Documents"/>
+                                <field name="invoice"/>
+                                <field name="move_id" required="False"/>
+                                <field name="statement_id"/>
+                            </group>
 
-                            <field name="debit"/>
-                            <field name="credit"/>
-                            <field name="company_id" required="1" groups="base.group_multi_company"/>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Dates"/>
+                                <field name="date" select="1"/>
+                                <field name="date_maturity"/>
+                                <field name="date_created"/>
+                            </group>
+                            
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Taxes"/>
+                                <field name="tax_code_id"/>
+                                <field name="tax_amount"/>
+                                <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+                            </group>
+                            
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Currency"/>
+                                <field name="currency_id"/>
+                                <field name="amount_currency"/>
+                            </group>
 
-                            <separator colspan="4" string="Optional Information"/>
-                            <field name="currency_id"/>
-                            <field name="amount_currency"/>
-                            <field name="quantity"/>
-                            <field name="move_id" required="False"/>
-                            <newline/>
-                            <field name="statement_id"/>
-                            <field name="blocked"/>
-                            <field name="date_maturity"/>
-                            <field name="date_created"/>
-                            <newline/>
-                            <field name="tax_code_id"/>
-                            <field name="tax_amount"/>
-                            <newline/>
-                            <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
-                            <field name="analytic_account_id"/>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Reconciliation"/>
+                                <field name="reconcile_id"/>
+                                <field name="reconcile_partial_id"/>
+                            </group>
 
-                            <separator colspan="4" string="State"/>
-                            <field name="journal_id"/>
-                            <field name="period_id"/>
-                            <field name="reconcile_id"/>
-                            <field name="reconcile_partial_id"/>
-                            <field name="state"/>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="States"/>
+                                <field name="state"/>
+                                <field name="blocked"/>
+                            </group>
+                            
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Analytic"/>
+                                <field name="analytic_account_id"/>
+                            </group>
+                            <separator string="Narration" colspan="4"/>
+                            <field name="narration" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Analytic Lines">
                             <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
@@ -926,7 +990,6 @@
             </field>
         </record>
 
-
         <record id="view_move_line_form2" model="ir.ui.view">
             <field name="name">account.move.line.form2</field>
             <field name="model">account.move.line</field>
@@ -934,7 +997,7 @@
             <field eval="9" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Account Entry Line">
-                    <notebook>
+                    <notebook colspan="4">
                         <page string="Information">
                             <separator colspan="4" string="General Information"/>
                             <field name="name" select="1"/>
@@ -974,6 +1037,19 @@
             </field>
         </record>
 
+        <record id="account_move_line_graph" model="ir.ui.view">
+            <field name="name">account.move.line.graph</field>
+            <field name="model">account.move.line</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Account Statistics" type="bar">
+                    <field name="account_id"/>
+                    <field name="debit" operator="+"/>
+                    <field name="credit" operator="+"/>
+                </graph>
+            </field>
+         </record>
+        
         <record id="view_account_move_line_filter" model="ir.ui.view">
             <field name="name">Entry Lines</field>
             <field name="model">account.move.line</field>
@@ -984,17 +1060,25 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
                         <separator orientation="vertical"/>
-                        <field name="date" select='1'/>
+                        <filter icon="terp-stock_symbol-selection" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Entry Lines"/>
+                        <filter icon="terp-stock_symbol-selection" string="Unreconciled" domain="[('reconcile_id','=',False), ('account_id.type','in',['receivable', 'payable'])]" help="Unreconciled Entry Lines"/>
+                        <separator orientation="vertical"/>
+                        <field name="ref" select="1" string="Reference"/>
+                        <field name="move_id" select="1" string="Number (Move)"/>
+                        <field name="name" select="1"/>
                         <field name="account_id" select='1'/>
                         <field name="partner_id" select='1'>
                             <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                         </field>
-                        <field name="balance" string="Debit/Credit" select='1'/>
                     </group>
                     <newline/>
                     <group col="10" colspan="4">
-                        <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
-                        <field name="period_id" widget="selection" context="{'period_id':self}"/>
+                        <field name="journal_id" required="1" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
+                        <field name="period_id" required="1" widget="selection" context="{'period_id':self}"/>
+                        <separator orientation="vertical"/>
+                        <field name="narration" select="1"/>
+                        <field name="date" select='1'/>
+                        <field name="balance" string="Debit/Credit" select='1'/>
                     </group>
                 </search>
             </field>
@@ -1020,28 +1104,55 @@
             <field name="search_view_id" ref="view_account_move_line_filter"/>
         </record>
 
+        <record id="action_move_line_select" model="ir.actions.act_window">
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
+            <field name="domain">[('account_id', 'child_of', active_id)]</field>
+        </record>
+        
+        <record id="ir_account_move_line_select" model="ir.values">
+            <field name="key2">tree_but_open</field>
+            <field name="model">account.account</field>
+            <field name="name">Open Journal Items</field>
+            <field eval="'ir.actions.act_window,%d'%action_move_line_select" name="value"/>
+            <field eval="True" name="object"/>
+        </record>
         <!--
     Account.Entry Edition
     -->
 
+        <record id="account_move_graph" model="ir.ui.view">
+            <field name="name">account.move.graph</field>
+            <field name="model">account.move</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Account Statistics" type="bar">
+                    <field name="period_id"/>
+                    <field name="amount" operator="+"/>
+                </graph>
+            </field>
+         </record>
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">account.move.tree</field>
             <field name="model">account.move</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Account Entry">
+                <tree colors="blue:state in ('draft');black:state in ('posted')" string="Account Entry">
                     <field name="name"/>
                     <field name="date"/>
                     <field name="ref"/>
                     <field name="journal_id"/>
                     <field name="period_id"/>
-                    <field name="type" invisible=" not context.get('set_visible',True)"/>
                     <field name="partner_id"/>
                     <field name="line_id"/>
                     <field name="to_check" groups="base.group_extended"/>
-                    <field name="amount"/>
+                    <field name="amount" sum="Total Amount"/>
                     <field name="state"/>
-                    <button name="button_validate" states="draft" string="Validate" type="object" icon="terp-camera_test"/>
+                    <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
@@ -1053,40 +1164,90 @@
                 <form string="Journal Entries">
                     <group colspan="4" col="6">
                         <field name="name" select="1" readonly="True"/>
+                        <field name="ref" select="1"/>
+                        <field name="to_check" groups="base.group_extended"/>
                         <field name="journal_id" select="1"/>
                         <field name="period_id"/>
-                        <field name="type"/>
-                        <field name="ref" select="1"/>
                         <field name="date" select="1"/>
+                        <field name="company_id" required="1" groups="base.group_multi_company"/>
+                        <field name="partner_id" invisible="1" select="1"/>
+                        <field name="amount" invisible="1" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Journal Entries Lines">
-                            <field colspan="4" height="200" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
+                            <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
                                 <form string="Account Entry Line">
-                                    <separator colspan="4" string="General Information"/>
-                                    <field name="name" select="1"/>
-                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
+                                    <group col="6" colspan="4">
+                                        <field name="name" select="1"/>
+                                        <field name="ref"/>
+                                        <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                                        
+                                        <field name="journal_id"/>
+                                        <field name="period_id"/>
+                                        <field name="company_id" required="1" groups="base.group_multi_company"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Information">
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Amount"/>
+                                                <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                                <field name="debit"/>
+                                                <field name="credit"/>
+                                                <field name="quantity"/>
+                                            </group>
+                                            
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Accounting Documents"/>
+                                                <field name="invoice"/>
+                                                <field name="move_id" required="False"/>
+                                                <field name="statement_id"/>
+                                            </group>
 
-                                    <field name="debit" select="1"/>
-                                    <field name="credit" select="1"/>
-                                    <field name="date" select="1"/>
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Dates"/>
+                                                <field name="date" select="1"/>
+                                                <field name="date_maturity"/>
+                                                <field name="date_created"/>
+                                            </group>
+                                            
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Taxes"/>
+                                                <field name="tax_code_id"/>
+                                                <field name="tax_amount"/>
+                                                <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+                                            </group>
+                                            
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Currency"/>
+                                                <field name="currency_id"/>
+                                                <field name="amount_currency"/>
+                                            </group>
 
-                                    <separator colspan="4" string="Optional Information"/>
-                                    <field name="currency_id"/>
-                                    <field name="amount_currency"/>
-                                    <field name="quantity" select="1"/>
-                                    <newline/>
-                                    <field name="date_maturity"/>
-                                    <field name="date_created"/>
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Reconciliation"/>
+                                                <field name="reconcile_id"/>
+                                                <field name="reconcile_partial_id"/>
+                                            </group>
 
-                                    <separator colspan="4" string="State"/>
-                                    <field name="reconcile_id"/>
-                                    <field name="reconcile_partial_id"/>
-                                    <field name="statement_id"/>
-                                    <field name="state"/>
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="States"/>
+                                                <field name="state"/>
+                                                <field name="blocked"/>
+                                            </group>
+                                            
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Analytic"/>
+                                                <field name="analytic_account_id"/>
+                                            </group>
+                                            <separator string="Narration" colspan="4"/>
+                                            <field name="narration" colspan="4" nolabel="1"/>
+                                        </page>
+                                        <page string="Analytic Lines">
+                                            <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
+                                        </page>
+                                    </notebook>
                                 </form>
-                                <tree editable="top" string="Account Entry Line">
+                                <tree colors="blue:state in ('draft');black:state in ('posted')" editable="top" string="Account Entry Line">
                                     <field name="ref"/>
                                     <field name="invoice"/>
                                     <field name="name"/>
@@ -1106,20 +1267,13 @@
                                 </tree>
                             </field>
                             <separator colspan="4" string="Narration"/>
-                            <field name="narration" colspan="4" nolabel="1"/>
-                            <field name="state" select="1"/>
-                            <group col="2" colspan="2">
-                                <button name="button_validate" states="draft" string="Validate" type="object" icon="terp-camera_test"/>
-                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="terp-gtk-stop"/>
+                            <field name="narration" colspan="4" nolabel="1" height="50"/>
+                            <group col="4" colspan="4">
+                                <field name="state" select="1"/>
+                                <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
+                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
-                        <page string="Other Information">
-                            <field name="company_id" required="1" groups="base.group_multi_company"/>
-                            <field name="date" select="1" groups="base.group_extended"/>
-                            <field name="to_check" groups="base.group_extended"/>
-                            <field name="partner_id" invisible="1" select="1"/>
-                            <field name="amount" invisible="1" select="1"/>
-                        </page>
                     </notebook>
                 </form>
             </field>
@@ -1135,29 +1289,37 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entries"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Entries"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-camera_test" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="To Review"/>
+                        <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="To Review"/>
+                        <separator orientation="vertical"/>
+                        <field name="ref" select="1"/>
+                        <field name="name" select="1"/>
+                        <field name="partner_id" select='1'/>   
                         <field name="date" select='1'/>
-                        <field name="name" select='1'/>
-                        <field name="journal_id" select='1'/>
-                        <field name="partner_id" select='1'/>
+                        <field name="narration" select="1"/>
+                    </group>
+                    <newline/>
+                    <group col='8' colspan='4'>
+                        <field name="journal_id" widget="selection" select='1'/>
+                        <field name="period_id" select='1'/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
                         <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>
         </record>
 
-
-       <record id="action_move_journal_line" model="ir.actions.act_window">
+        <record id="action_move_journal_line" model="ir.actions.act_window">
             <field name="name">Journal Entries</field>
             <field name="res_model">account.move</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
@@ -1186,22 +1348,21 @@
             res_model="account.move.line"
             src_model="account.move"/>
 
-        <record id="action_move_to_review" model="ir.actions.act_window">
-            <field name="name">Journal Entries</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.move</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_move_tree"/>
-            <field name="search_view_id" ref="view_account_move_filter"/>
-            <field name="domain">[('to_check','=',True), ('state','=','draft')]</field>
-        </record>
-        
-        <menuitem 
-            action="action_move_to_review" 
-            id="menu_action_move_to_review" 
-            parent="periodical_processing_journal_entries_validation"
-        />
-        
+<!--        <record id="action_move_to_review" model="ir.actions.act_window">-->
+<!--            <field name="name">Journal Entries</field>-->
+<!--            <field name="type">ir.actions.act_window</field>-->
+<!--            <field name="res_model">account.move</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_id" ref="view_move_tree"/>-->
+<!--            <field name="search_view_id" ref="view_account_move_filter"/>-->
+<!--            <field name="domain">[('to_check','=',True), ('state','=','draft')]</field>-->
+<!--        </record>-->
+<!--        <menuitem-->
+<!--            action="action_move_to_review"-->
+<!--            id="menu_action_move_to_review"-->
+<!--            parent="periodical_processing_journal_entries_validation"-->
+<!--        />-->
+
 <!--        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>-->
 <!--        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>-->
 
@@ -1220,7 +1381,7 @@
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_move_line_tree"/>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
             <field name="domain">[('journal_id.type', 'in', ['sale', 'purchase_refund'])]</field>
@@ -1232,11 +1393,10 @@
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_move_line_tree"/>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
             <field name="domain">[('journal_id.type', 'in', ['purchase', 'sale_refund'])]</field>
-            <field name="context">{'journal_id':1}</field>
         </record>
 
         <menuitem action="action_account_moves_purchase" id="menu_eaction_account_moves_purchase" parent="menu_finance_payables"/>
@@ -1331,7 +1491,7 @@
                         <field name="balance_end"/>
                         <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="terp-gtk-stop"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -1401,7 +1561,7 @@
             <field name="model">account.journal.period</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Journals">
+                <tree colors="blue:state in ('draft');gray:state in ('done');black:state in ('printed')" string="Journals">
                     <field icon="icon" name="fiscalyear_id"/>
                     <field name="period_id"/>
                     <field name="journal_id"/>
@@ -1414,6 +1574,7 @@
             <field name="name">Journals</field>
             <field name="res_model">account.journal.period</field>
             <field name="view_type">tree</field>
+            <field name="help">You can look up individual account entries by searching for useful information. To search for account entries, open a journal, then select a record line.</field>
         </record>
         <menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_generic_reporting" sequence="2"/>
 
@@ -1493,12 +1654,12 @@
             </field>
         </record>
         <record id="action_model_form" model="ir.actions.act_window">
-            <field name="name">Define Recurring</field>
+            <field name="name">Recurring Models</field>
             <field name="res_model">account.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_model_form" id="menu_action_model_form" parent="account.menu_configuration_misc"/>
+        <menuitem action="action_model_form" id="menu_action_model_form" sequence="5" parent="account.menu_configuration_misc"/>
 
         <!--
             # Payment Terms
@@ -1615,7 +1776,7 @@
             <field name="model">account.subscription</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Entry Subscription">
+                <tree colors="blue:state in ('draft');gray:state in ('done');black:state in ('running')" string="Entry Subscription">
                     <field name="ref"/>
                     <field name="name"/>
                     <field name="date_start"/>
@@ -1628,39 +1789,46 @@
             <field name="model">account.subscription</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Entry Subscription">
-                    <field name="name" select="1"/>
-                    <field name="ref" select="1"/>
-
-                    <separator colspan="4" string="Subscription Periods"/>
-                    <field name="date_start" select="1"/>
-                    <field name="period_total"/>
-
-                    <field name="period_nbr"/>
-                    <field name="period_type"/>
-                    <field name="model_id"/>
+                <form string="Recurring">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="model_id"/>
+                        <field name="ref" select="1"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Starts on"/>
+                        <field name="date_start" select="1"/>
+                        <field name="period_total"/>
+                        
+                    </group>
+                    
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Valid Up to"/>
+                        <field name="period_nbr"/>
+                        <field name="period_type"/>
+                    </group>
+                    
                     <group col="2" colspan="2">
-                        <button name="compute" states="draft,running" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                        <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
                     </group>
                     <separator colspan="4" string="Subscription Lines"/>
                     <field colspan="4" name="lines_id" widget="one2many_list" nolabel="1"/>
 
-                    <separator colspan="4" string="State"/>
-                    <field name="state"/>
-                    <group col="1" colspan="2">
+                    <group col="6" colspan="4">
+                        <field name="state"/>
                         <button name="state_draft" states="done" string="Set to Draft" type="object"  icon="gtk-convert" />
+                        <button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
+                        <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
                     </group>
                 </form>
             </field>
         </record>
         <record id="action_subscription_form" model="ir.actions.act_window">
-            <field name="name">Subscription Entries</field>
+            <field name="name">Recurring Lines</field>
             <field name="res_model">account.subscription</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-<!--        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_recurrent_entries"/>-->
+        <menuitem action="action_subscription_form" id="menu_action_subscription_form" sequence="5" parent="account.menu_configuration_misc"/>
 
         <record id="action_subscription_form_running" model="ir.actions.act_window">
             <field name="name">Running Subscriptions</field>
@@ -1717,7 +1885,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Account Entry Line">
+                <tree colors="blue:state in ('draft');black:state in ('valid')" string="Account Entry Line">
                     <field name="date"/>
                     <field name="move_id"/>
                     <field name="statement_id" string="St."/>
@@ -1741,7 +1909,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_line_tax_tree"/>
-            <field name="domain">[('tax_code_id','=',active_id),('state','&lt;&gt;','draft')]</field>
+            <field name="domain">[('tax_code_id','child_of',active_id),('state','&lt;&gt;','draft')]</field>
         </record>
         <record id="ir_open_tax_move_line" model="ir.values">
             <field name="key2">tree_but_open</field>
@@ -1758,11 +1926,11 @@
 
         <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_bank_statement" name="Bank statements" res_model="account.bank.statement" src_model="account.journal"/>
 
-        <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Entry lines" res_model="account.move.line" src_model="account.journal"/>
+        <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Journal Items" res_model="account.move.line" src_model="account.journal"/>
 
-        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
+        <act_window context="{'search_default_reconcile_id':False}" domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
 
-        <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
+        <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Create Account</field>
@@ -2252,7 +2420,7 @@
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_move_line_tree"/>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
         </record>
@@ -2266,24 +2434,23 @@
         />
 
         <!-- Cash Statement -->
-        <record id="view_bank_statement_tree" model="ir.ui.view">
+        <record id="view_cash_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
             <field name="model">account.bank.statement</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state in ('open');blue:state in ('draft')" string="Statement">
-                    <field name="date"/>
+                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state in ('open')" string="Statement">
                     <field name="name"/>
-                    <field name="journal_id"/>
+                    <field name="date"/>
                     <field name="period_id"/>
+                    <field name="journal_id"/>
                     <field name="balance_start"/>
                     <field name="balance_end_real"/>
                     <field name="balance_end"/>
-                        <field name="user_id" select="1"/>
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
-                    <button type="object" string="Confirm" name="button_confirm_cash" states="open" icon="terp-gtk-go-back-rtl"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
+                    <button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
@@ -2334,7 +2501,7 @@
                         </page>
                         <page string="CashBox">
                             <group col="2" colspan="2" expand="1">
-                                <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','=','draft')]}">
+                                <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','!=','draft')]}">
                                     <tree string = "Opening Balance" editable="bottom">
                                         <field name="pieces"/>
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
@@ -2348,7 +2515,7 @@
                                 </field>
                             </group>
                             <group col="2" colspan="2" expand="1">
-                                <field name="ending_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','=','draft')]}">
+                                <field name="ending_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','!=','open')]}">
                                     <tree string = "Closing Balance" editable="bottom">
                                         <field name="pieces"/>
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
@@ -2369,7 +2536,7 @@
                     <group col="6" colspan="4">
                         <group col="2" colspan="2">
                             <separator string="Dates" colspan="4"/>
-                            <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date)"/>
                             <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
                         </group>
                         <group col="2" colspan="2">
@@ -2387,25 +2554,38 @@
                         <field name="state" colspan="4"/>
                         <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-check" type="object"/>
                         <button name="button_open" states="draft" string="Open CashBox" icon="terp-document-new" type="object"/>
-                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
+                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="gtk-cancel" type="object" groups="base.group_extended"/>
                     </group>
                 </form>
             </field>
         </record>
+        <record id="account_cash_statement_graph" model="ir.ui.view">
+            <field name="name">account.bank.statement.graph</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Account Statistics" type="bar">
+                    <field name="date"/>
+                    <field name="balance_start" operator="+"/>
+                    <field name="balance_end" operator="+"/>
+                </graph>
+            </field>
+         </record>
         <record id="action_view_bank_statement_tree" model="ir.actions.act_window">
             <field name="name">Cash Register</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="view_id" ref="view_cash_statement_tree"/>
             <field name="search_view_id" ref="view_account_bank_statement_filter"/>
             <field name="domain">[('journal_id.type', '=', 'cash')]</field>
+            <field name="context">{'journal_type':'cash'}</field>
         </record>
         <record model="ir.actions.act_window.view" id="act_cash_statement1_all">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="view_id" ref="view_cash_statement_tree"/>
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
         <record model="ir.actions.act_window.view" id="act_cash_statement2_all">
@@ -2414,6 +2594,12 @@
             <field name="view_id" ref="view_bank_statement_form2"/>
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
+        <record model="ir.actions.act_window.view" id="act_cash_statement3_all">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="account_cash_statement_graph"/>
+            <field name="act_window_id" ref="action_view_bank_statement_tree"/>
+        </record>
         <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
 
     </data>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 6738c7a7d37..ac751e00a72 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -29,7 +29,7 @@
                 <form string="Account Board">
                     <hpaned>
                         <child1>
-                            <action colspan="4" height="160" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
+                            <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
                         </child1>
                         <child2>
                             <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
@@ -49,7 +49,7 @@
             <field name="view_id" ref="board_account_form"/>
         </record>
 
-        <menuitem icon="terp-graph" id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting"/>
+        <menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
     </data>
 </openerp>
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index 10303dd8cbf..235716e4c94 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -74,12 +74,6 @@
             <field name="field">credit</field>
             <field eval="11" name="sequence"/>
         </record>
-        <record id="bank_col12" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Analytic Account</field>
-            <field name="field">analytic_account_id</field>
-            <field eval="13" name="sequence"/>
-        </record>
         <record id="bank_col3" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Ref</field>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index a1f3204b7f0..d0a2eb78404 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -62,92 +62,235 @@
         <!--
         Chart of Account
         -->
-        <record id="minimal_0" model="account.account">
-            <field name="code">x 0</field>
+        
+        <record id="chart0" model="account.account">
+            <field name="code">X0</field>
             <field name="name">Chart For Automated Tests</field>
-            <field eval="False" name="parent_id"/>
+            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own accounts.
-            </field>
             <field name="user_type" ref="account_type_root"/>
         </record>
-        <record id="a_recv" model="account.account">
-            <field name="name">Main Receivable</field>
-            <field name="code">x 40000</field>
-            <field name="type">receivable</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_receivable"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
+
+        <!-- Balance Sheet -->
+
+        <record id="bal" model="account.account">
+            <field name="code">X1</field>
+            <field name="name">Balance Sheet - (test)</field>
+            <field ref="chart0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_root"/>
         </record>
-        <record id="a_pay" model="account.account">
-            <field name="name">Main Payable</field>
-            <field name="code">x 44000</field>
-            <field name="type">payable</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_payable"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
+        
+        <record model="account.account" id="assets_view">
+            <field name="name">Assets - (test)</field>
+            <field name="code">X10</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
         </record>
-        <record id="cash" model="account.account">
-            <field name="name">Petty Cash</field>
-            <field name="code">x 57000</field>
-            <field name="type">other</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="user_type" ref="account_type_cash_moves"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
+        
+        <record model="account.account" id="liabilities_view">
+            <field name="name">Liabilities - (test)</field>
+            <field name="code">X11</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
         </record>
-        <record id="a_expense" model="account.account">
-            <field name="name">Products Purchase</field>
-            <field name="code">x 60000</field>
-            <field name="type">other</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="user_type" ref="account_type_expense"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
-        </record>
-        <record id="a_sale" model="account.account">
-            <field name="name">Products Sales</field>
-            <field name="code">x 70000</field>
-            <field name="type">other</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="user_type" ref="account_type_income"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
+            
+        <record id="fas" model="account.account">
+            <field name="code">X100</field>
+            <field name="name">Fixed Assets - (test)</field>
+            <field ref="assets_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset"/>
         </record>
 
+        <record id="xfa" model="account.account">
+            <field name="code">X1000</field>
+            <field name="name">Fixed Asset Account - (test)</field>
+            <field ref="fas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="nca" model="account.account">
+            <field name="code">X101</field>
+            <field name="name">Net Current Assets - (test)</field>
+            <field ref="assets_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="cas" model="account.account">
+            <field name="code">X1100</field>
+            <field name="name">Current Assets - (test)</field>
+            <field ref="nca" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="stk" model="account.account">
+            <field name="code">X11001</field>
+            <field name="name">Purchased Stocks - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="a_recv" model="account.account">
+            <field name="code">X11002</field>
+            <field name="name">Debtors - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field eval="True" name="reconcile"/>
+            <field name="user_type" ref="account_type_receivable"/>
+        </record>
+
+        <record id="ova" model="account.account">
+            <field name="code">X11003</field>
+            <field name="name">Output VAT - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_receivable"/>
+        </record>
+
+        <record id="bnk" model="account.account">
+            <field name="code">X11004</field>
+            <field name="name">Bank Current Account - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="cash" model="account.account">
+            <field name="code">X11005</field>
+            <field name="name">Cash - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="cli" model="account.account">
+            <field name="code">X110</field>
+            <field name="name">Current Liabilities - (test)</field>
+            <field ref="liabilities_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_liability"/>
+        </record>
+
+        <record id="a_pay" model="account.account">
+            <field name="code">X1111</field>
+            <field name="name">Creditors - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">payable</field>
+            <field eval="True" name="reconcile"/>
+            <field name="user_type" ref="account_type_payable"/>
+        </record>
+
+        <record id="iva" model="account.account">
+            <field name="code">X1112</field>
+            <field name="name">Input VAT - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_payable"/>
+        </record>
+
+        <!-- Profit and Loss -->
+
+        <record id="gpf" model="account.account">
+            <field name="code">X2</field>
+            <field name="name">Profit and Loss - (test)</field>
+            <field ref="chart0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_root"/>
+        </record>
+        
+        <record model="account.account" id="income_view">
+            <field name="name">Income - (test)</field>
+            <field name="code">X20</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
+        </record>
+        
+        <record model="account.account" id="income_fx_income">
+            <field name="name">Foreign Exchange Gain - (test)</field>
+            <field name="code">X201</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="income_view"/>
+        </record>
+        
+        <record model="account.account" id="expense_view">
+            <field name="name">Expense - (test)</field>
+            <field name="code">X21</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
+        </record>
+        
+        <record id="rev" model="account.account">
+            <field name="code">X200</field>        
+            <field name="name">Revenue - (test)</field>
+            <field ref="income_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_income"/>
+        </record>
+
+        <record id="a_sale" model="account.account">
+            <field name="code">X2001</field>
+            <field name="name">Product Sales - (test)</field>
+            <field ref="rev" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_income"/>
+        </record>
+
+        <record id="cos" model="account.account">
+            <field name="code">X210</field>
+            <field name="name">Cost of Sales - (test)</field>
+            <field ref="expense_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
+        <record id="cog" model="account.account">
+            <field name="code">X2100</field>
+            <field name="name">Cost of Goods Sold - (test)</field>
+            <field ref="cos" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
+        <record id="ovr" model="account.account">
+            <field name="code">X211</field>
+            <field name="name">Overheads - (test)</field>
+            <field ref="expense_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
+        <record id="a_expense" model="account.account">
+            <field name="code">X2110</field>
+            <field name="name">Expenses - (test)</field>
+            <field ref="ovr" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+        
+        <record model="account.account" id="income_fx_expense">
+            <field name="name">Foreign Exchange Loss - (test)</field>
+            <field name="code">X2111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="ovr"/>
+        </record>
+        
         <!-- Properties -->
         <record forcecreate="True" id="property_account_receivable" model="ir.property">
             <field name="name">property_account_receivable</field>
@@ -174,7 +317,7 @@ your own chart of account.
         -->
 
         <record id="sales_journal" model="account.journal">
-            <field name="name">x Sales Journal</field>
+            <field name="name">Sales Journal - (test)</field>
             <field name="code">SAJ</field>
             <field name="type">sale</field>
             <field name="view_id" ref="account_sp_journal_view"/>
@@ -185,7 +328,7 @@ your own chart of account.
             <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="refund_sales_journal" model="account.journal">
-            <field name="name">x Sales Credit Note Journal</field>
+            <field name="name">Sales Credit Note Journal - (test)</field>
             <field name="code">SCNJ</field>
             <field name="type">sale_refund</field>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
@@ -196,7 +339,7 @@ your own chart of account.
         </record>
 
         <record id="expenses_journal" model="account.journal">
-            <field name="name">x Expenses Journal</field>
+            <field name="name">Expenses Journal - (test)</field>
             <field name="code">EXJ</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account_sp_journal_view"/>
@@ -207,7 +350,7 @@ your own chart of account.
             <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="refund_expenses_journal" model="account.journal">
-            <field name="name">x Expenses Credit Notes Journal</field>
+            <field name="name">Expenses Credit Notes Journal - (test)</field>
             <field name="code">ECNJ</field>
             <field name="type">purchase_refund</field>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
@@ -218,7 +361,7 @@ your own chart of account.
         </record>
 
         <record id="bank_journal" model="account.journal">
-            <field name="name">x Bank Journal</field>
+            <field name="name">Bank Journal - (test)</field>
             <field name="code">BNK</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>
@@ -228,7 +371,7 @@ your own chart of account.
             <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="check_journal" model="account.journal">
-            <field name="name">x Checks Journal</field>
+            <field name="name">Checks Journal - (test)</field>
             <field name="code">CHK</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>
@@ -242,18 +385,18 @@ your own chart of account.
         Product income and expense accounts, default parameters
         -->
 
-        <record id="property_account_expense_prd" model="ir.property">
-            <field name="name">property_account_expense</field>
-            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_expense')]"/>
-            <field eval="'account.account,'+str(ref('account.a_expense'))" name="value"/>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="property_account_income_prd" model="ir.property">
-            <field name="name">property_account_income</field>
-            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_income')]"/>
-            <field eval="'account.account,'+str(ref('account.a_sale'))" name="value"/>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
+<!--        <record id="property_account_expense_prd" model="ir.property">-->
+<!--            <field name="name">property_account_expense</field>-->
+<!--            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_expense')]"/>-->
+<!--            <field eval="'account.account,'+str(ref('account.a_expense'))" name="value"/>-->
+<!--            <field name="company_id" ref="base.main_company"/>-->
+<!--        </record>-->
+<!--        <record id="property_account_income_prd" model="ir.property">-->
+<!--            <field name="name">property_account_income</field>-->
+<!--            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_income')]"/>-->
+<!--            <field eval="'account.account,'+str(ref('account.a_sale'))" name="value"/>-->
+<!--            <field name="company_id" ref="base.main_company"/>-->
+<!--        </record>-->
         <record id="property_account_expense_categ" model="ir.property">
             <field name="name">property_account_expense_categ</field>
             <field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_expense_categ')]"/>
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 23792613cb9..b00b32f3ad2 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* account
+#	* account
 #
 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"
-"PO-Revision-Date: 2010-05-15 09:04+0000\n"
-"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
+"PO-Revision-Date: 2010-07-16 07:38+0000\n"
+"Last-Translator: Plamen K. Kosseff <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-06-22 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-07-17 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -24,7 +24,7 @@ msgstr "Вътрешно име"
 #. module: account
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "Код на данъчна сметка"
+msgstr "Данъчен код"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree9
@@ -40,7 +40,7 @@ msgstr "Кодиране на записи"
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr "Определи съобщението за доклад на просрочените плащания."
+msgstr "Определи съобщението за доклада с просрочени плащания."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -89,10 +89,11 @@ msgstr "Резултат от изравняване"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "Несъгласувани стойности"
+msgstr "Неизравнени стойности"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Основен код"
@@ -116,7 +117,7 @@ msgstr "Основна"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Разписка за дневник"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -124,7 +125,8 @@ msgid "Residual"
 msgstr "Остатък"
 
 #. module: account
-#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -188,8 +190,8 @@ msgid "Move line select"
 msgstr "Премесетване на избрания ред"
 
 #. module: account
-#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0
+#: rml:account.tax.code.entries:0
 msgid "Entry label"
 msgstr "Етикет на запис"
 
@@ -204,12 +206,14 @@ msgid "Period Sum"
 msgstr "Сума за периода"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Изчисли кода (if type=code)"
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Ред от запис на сметка"
 
@@ -226,10 +230,12 @@ msgstr "Повтарящи се записи"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
-#: field:account.invoice.tax,amount:0 field:account.move,amount:0
-#: field:account.tax,amount:0 field:account.tax.template,amount:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.reconcile.line,amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: field:account.move,amount:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
 msgid "Amount"
 msgstr "Сума"
 
@@ -269,7 +275,8 @@ msgstr ""
 "набиране във всеки дневник."
 
 #. module: account
-#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -283,19 +290,20 @@ msgstr ""
 "например 50% сега и 50% след месец."
 
 #. module: account
-#: selection:account.tax,type:0 selection:account.tax.template,type:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Фиксиран"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
 msgid "Overdue Payments"
 msgstr "Просрочени плащания"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -304,7 +312,8 @@ msgid "Select period"
 msgstr "Избери период"
 
 #. module: account
-#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Произход"
 
@@ -334,7 +343,9 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice,amount_tax:0
+#: model:account.account.type,name:account.account_type_tax
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Данък"
@@ -347,18 +358,22 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Аналитична сметка"
 
 #. module: account
-#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Данък върху подчинени"
 
 #. module: account
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Име на дневник"
@@ -426,8 +441,11 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
-#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
+#: field:account.analytic.account,state:0
+#: field:account.bank.statement,state:0
+#: field:account.invoice,state:0
+#: view:account.move:0
+#: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Състояние"
@@ -439,7 +457,8 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Неплатени обезщетения на доставчици"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Специалини изчисления"
 
@@ -461,8 +480,10 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0 field:account.model,ref:0
-#: field:account.move,ref:0 rml:account.overdue:0
+#: rml:account.general.ledger:0
+#: field:account.model,ref:0
+#: field:account.move,ref:0
+#: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Отпратка"
@@ -653,9 +674,13 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0
+#: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Аналитични записи"
 
@@ -670,6 +695,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr ""
@@ -685,7 +711,8 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -717,7 +744,8 @@ msgid "Field Name"
 msgstr "Име на поле"
 
 #. module: account
-#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0
+#: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Знак за родител"
 
@@ -727,7 +755,8 @@ msgid "End of Year Entries Journal"
 msgstr "Днвеник за записи в края на годината"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -747,9 +776,12 @@ msgid "Move Lines Created."
 msgstr "Създадени редове за преместване"
 
 #. module: account
-#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
-#: field:account.move,state:0 field:account.move.line,state:0
-#: field:account.period,state:0 field:account.subscription,state:0
+#: field:account.fiscalyear,state:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: field:account.subscription,state:0
 msgid "Status"
 msgstr "Състояние"
 
@@ -902,8 +934,10 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
-#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Количество"
@@ -946,13 +980,16 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0 rml:account.general.journal:0
+#: view:account.fiscalyear:0
+#: rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0 field:account.move,period_id:0
+#: field:account.journal.period,period_id:0
+#: field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0
+#: view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -974,7 +1011,8 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1098,7 +1136,8 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Единична цена"
 
@@ -1251,7 +1290,8 @@ msgid "Not reconciled transactions"
 msgstr "Няма обединяващи транзакции"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1273,7 +1313,8 @@ msgid "Write-Off account"
 msgstr "Сметка за отписвания"
 
 #. module: account
-#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0
+#: field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Модел"
 
@@ -1299,9 +1340,11 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0
+#: field:account.journal,view_id:0
 msgid "View"
 msgstr "Изглед"
 
@@ -1372,7 +1415,8 @@ msgstr "Видове сметки"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1388,7 +1432,8 @@ msgid "Journal"
 msgstr "Дневник"
 
 #. module: account
-#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0
+#: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1414,7 +1459,8 @@ msgid "Statement reconcile line"
 msgstr "Ред от отчет за приравняване"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Запазете празно за да изпозвате сметката за приходи"
 
@@ -1423,6 +1469,9 @@ msgstr "Запазете празно за да изпозвате сметка
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr "Отписване"
 
@@ -1541,7 +1590,8 @@ msgid "Account n°"
 msgstr "Сметка n°"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Запазете празно за да изпозвате сметката за разходи"
 
@@ -1551,7 +1601,8 @@ msgid "Account to reconcile"
 msgstr "Сметка за приравняване"
 
 #. module: account
-#: rml:account.invoice:0 field:account.model.line,partner_id:0
+#: rml:account.invoice:0
+#: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Препратки към партньора"
@@ -1563,12 +1614,14 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0 field:account.subscription,lines_id:0
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Редове на абонамент"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1732,7 +1785,8 @@ msgid "Period length (days)"
 msgstr "Продължителност на период (дни)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Процент"
@@ -1743,7 +1797,8 @@ msgid "Charts"
 msgstr "Диаграми"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1817,9 +1872,11 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
-#: field:account.journal,type:0 field:account.move,type:0
-#: field:account.move.reconcile,type:0 xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: field:account.journal,type:0
+#: field:account.move,type:0
+#: field:account.move.reconcile,type:0
 msgid "Type"
 msgstr "Вид"
 
@@ -1967,7 +2024,8 @@ msgid "Journal-Period Name"
 msgstr "Име на период на дневник"
 
 #. module: account
-#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Име на условие за данък"
 
@@ -1982,7 +2040,8 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2055,8 +2114,10 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
-#: field:account.journal,currency:0 field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.journal,currency:0
+#: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Валута"
@@ -2094,7 +2155,8 @@ msgid "Analytic Entry"
 msgstr "Аналитичен запис"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2146,7 +2208,8 @@ msgid "Detail"
 msgstr "Подробно"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Консолидация"
 
@@ -2212,9 +2275,13 @@ msgid "Date Invoiced"
 msgstr "Дата на фактуриране"
 
 #. module: account
-#: help:account.balance.account.balance.report,init,periods:0
+#: help:account.account.balance.report,checktype,periods:0
+#: help:account.general.ledger.report,checktype,periods:0
+#: help:account.partner.balance.report,init,periods:0
+#: help:account.third_party_ledger.report,init,periods:0
+#: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr "Ако е празно всички периоди"
+msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2237,17 +2304,22 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0
+#: rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0 field:account.move,date:0
+#: rml:account.journal.period.print:0
+#: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
+#: field:account.subscription.line,date:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Date"
 msgstr "Дата"
 
@@ -2263,7 +2335,8 @@ msgid "Unreconcile"
 msgstr "Връщане приравняване"
 
 #. module: account
-#: field:account.tax,type:0 field:account.tax.template,type:0
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Вид данък"
 
@@ -2273,7 +2346,8 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0
+#: field:account.journal,user_id:0
 msgid "User"
 msgstr "Потребител"
 
@@ -2359,15 +2433,18 @@ msgid "Date End"
 msgstr "Крайна дата"
 
 #. module: account
-#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0
+#: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
 msgstr "Редове на запис"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Приложим код (if type=code)"
 
@@ -2456,9 +2533,11 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0
+#: wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0
+#: view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2477,7 +2556,8 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Отказ"
 
@@ -2487,8 +2567,10 @@ msgid "Acc. Type Name"
 msgstr "Име на вида на сметката"
 
 #. module: account
-#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2502,7 +2584,8 @@ msgid "Litigation"
 msgstr "Жалба"
 
 #. module: account
-#: view:account.move.line:0 wizard_view:account.move.validate,init:0
+#: view:account.move.line:0
+#: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Информация"
@@ -2545,6 +2628,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2612,7 +2697,8 @@ msgid "Price"
 msgstr "Цена"
 
 #. module: account
-#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2647,6 +2733,7 @@ msgid "Invoice Number"
 msgstr "Номер на фактура"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr ""
@@ -2679,13 +2766,17 @@ msgid "Invoice Reference"
 msgstr "Отпратка на фактура"
 
 #. module: account
-#: field:account.account,name:0 field:account.account.template,name:0
+#: field:account.account,name:0
+#: field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0 field:account.config.wizard,name:0
-#: field:account.model.line,name:0 field:account.move,name:0
-#: field:account.move.line,name:0 field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0
+#: field:account.config.wizard,name:0
+#: field:account.model.line,name:0
+#: field:account.move,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Име"
@@ -2725,7 +2816,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0 view:account.journal.view:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2818,11 +2910,14 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2843,7 +2938,9 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0 view:product.template:0 view:res.partner:0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
 msgid "Accounting"
 msgstr "Счетоводство"
 
@@ -2876,9 +2973,11 @@ msgstr "Редове на запис"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr "Обединяване"
 
@@ -2888,8 +2987,10 @@ msgid "Centralisation"
 msgstr "Централизация"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
-#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax,tax_code_id:0
+#: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Код на данък"
@@ -2932,12 +3033,13 @@ msgstr ""
 "условията за плащане на партньора."
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Situation"
 msgstr "Ситуация"
 
 #. module: account
-#: rml:account.invoice:0 xsl:account.transfer:0
+#: rml:account.invoice:0
 msgid "Document"
 msgstr "Документ"
 
@@ -2975,7 +3077,8 @@ msgid "Cancel selected invoices"
 msgstr "Отказа на избраните фактури"
 
 #. module: account
-#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -2984,6 +3087,8 @@ msgstr "Аналитичен дневник"
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr ""
 
@@ -2998,23 +3103,28 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Пращане в проект"
 
 #. module: account
-#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Платим"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.tax,base:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Основа"
 
@@ -3024,7 +3134,8 @@ msgid "Model Name"
 msgstr "Име на модела"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3034,13 +3145,15 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.move:0
+#: view:account.invoice:0
+#: view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Проверка"
 
 #. module: account
-#: view:account.model:0 field:account.model,legend:0
+#: view:account.model:0
+#: field:account.model,legend:0
 msgid "Legend"
 msgstr "Легенда"
 
@@ -3055,14 +3168,17 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0 rml:account.account.balance:0
+#: view:account.account:0
+#: rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0
+#: field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3083,9 +3199,12 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0 view:account.invoice.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Бележки"
@@ -3098,7 +3217,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3123,15 +3243,21 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0 rml:account.account.balance:0
-#: field:account.account.template,code:0 field:account.account.type,code:0
+#: field:account.account,code:0
+#: rml:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
-#: rml:account.general.journal:0 field:account.journal,code:0
-#: rml:account.partner.balance:0 field:account.period,code:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0
+#: field:account.fiscalyear,code:0
+#: rml:account.general.journal:0
+#: field:account.journal,code:0
+#: rml:account.partner.balance:0
+#: field:account.period,code:0
 msgid "Code"
 msgstr "Код"
 
@@ -3141,7 +3267,8 @@ msgid "Financial Management"
 msgstr "Управление на финанси"
 
 #. module: account
-#: selection:account.account.type,close_method:0 selection:account.tax,type:0
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Няма"
@@ -3153,6 +3280,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr ""
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr "Приравняване на записи"
@@ -3168,7 +3296,8 @@ msgid "Additionnal Information"
 msgstr "Допълнителна информация"
 
 #. module: account
-#: field:account.tax,name:0 field:account.tax.template,name:0
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Име на данък"
@@ -3245,7 +3374,8 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3258,7 +3388,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3297,7 +3428,8 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:wizard.company.setup:0
+#: view:account.invoice:0
+#: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Създаване"
@@ -3313,7 +3445,8 @@ msgid "Invoice line"
 msgstr "Ред от фактура"
 
 #. module: account
-#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Пряк път"
 
@@ -3340,13 +3473,15 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Родителска сметка за данъци"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0 view:account.account.type:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3382,7 +3517,8 @@ msgid "Central Journal"
 msgstr "Централен дневник"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Баланс пренесен напред"
 
@@ -3406,9 +3542,10 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: selection:account.balance.account.balance.report,init,account_choice:0
+#: selection:account.account.balance.report,checktype,display_account:0
+#: selection:account.general.ledger.report,checktype,display_account:0
 msgid "With balance is not equal to 0"
-msgstr "С баланс различен от 0"
+msgstr ""
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -3457,7 +3594,8 @@ msgid "Journal code"
 msgstr "Код на дневник"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0
+#: view:account.model:0
 msgid "Create entries"
 msgstr "Създаване на записи"
 
@@ -3494,7 +3632,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr "Име на запис"
@@ -3513,11 +3650,14 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Последователност"
@@ -3583,7 +3723,8 @@ msgstr "Абонамент за сметка"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0 rml:account.overdue:0
+#: field:account.move.line,date_maturity:0
+#: rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Дата на падеж"
 
@@ -3603,7 +3744,8 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3641,7 +3783,8 @@ msgid "Unreconciled"
 msgstr "Неприравнен"
 
 #. module: account
-#: field:account.account,note:0 field:account.account.template,note:0
+#: field:account.account,note:0
+#: field:account.account.template,note:0
 msgid "Note"
 msgstr "Бележка"
 
@@ -3665,7 +3808,8 @@ msgid "Entry Sequence"
 msgstr "Запис за последователност"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Приключен"
 
@@ -3788,9 +3932,12 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0 field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0 field:account.journal,active:0
-#: field:account.journal.period,active:0 field:account.payment.term,active:0
+#: field:account.account,active:0
+#: field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Активен"
@@ -3842,15 +3989,20 @@ msgid "Secondary Currency"
 msgstr "Втора валута"
 
 #. module: account
-#: field:account.account,credit:0 rml:account.account.balance:0
+#: field:account.account,credit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.journal.period.print:0
-#: field:account.model.line,credit:0 field:account.move.line,credit:0
-#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3883,7 +4035,8 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Редове на отчет"
 
@@ -3975,15 +4128,18 @@ msgid "Journal Column"
 msgstr "Колона на дневник"
 
 #. module: account
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Готово"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0 view:account.fiscalyear:0
+#: field:account.config.wizard,period:0
+#: view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -3996,7 +4152,8 @@ msgid "Periods"
 msgstr "Периоди"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4023,7 +4180,8 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Данъци по подрабиране"
 
@@ -4080,7 +4238,8 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Име на сметка"
 
@@ -4171,7 +4330,8 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0 field:account.account.template,type:0
+#: field:account.account,type:0
+#: field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4197,12 +4357,14 @@ msgid "Posted"
 msgstr "Публикувано"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0
+#: field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4223,7 +4385,8 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Редове"
 
@@ -4241,7 +4404,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Данъчна декларация"
 
@@ -4301,12 +4465,14 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0 view:account.period:0
+#: view:account.fiscalyear:0
+#: view:account.period:0
 msgid "States"
 msgstr "Провинции"
 
@@ -4320,7 +4486,7 @@ msgstr "Записи на сметка"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
 msgid "Receivables & Payables"
-msgstr "Приходни и разходни"
+msgstr ""
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -4342,7 +4508,8 @@ msgstr "Начална дата"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Общо"
 
@@ -4459,9 +4626,11 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0 field:account.journal,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4558,9 +4727,12 @@ msgid "Print Aged Trial Balance"
 msgstr "Отпечатай стара оборотна ведомост"
 
 #. module: account
-#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0 field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0
+#: field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Отпратка"
 
@@ -4637,7 +4809,8 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Приходен"
@@ -4664,7 +4837,8 @@ msgstr "ДДС:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4675,7 +4849,8 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4691,7 +4866,8 @@ msgid "Account Reconciliation"
 msgstr "Приравняване на сметка"
 
 #. module: account
-#: view:account.bank.statement:0 selection:account.bank.statement,state:0
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Потвърждение"
 
@@ -4706,7 +4882,8 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0 help:account.tax.template,domain:0
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4726,7 +4903,8 @@ msgid "Analytic account"
 msgstr "Аналтична сметка"
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Фактура за доставчик"
 
@@ -4736,16 +4914,22 @@ msgid "Valid"
 msgstr "Проверен"
 
 #. module: account
-#: field:account.account,debit:0 rml:account.account.balance:0
+#: field:account.account,debit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 field:account.model.line,debit:0
-#: field:account.move.line,debit:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.central.journal:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Дебит"
@@ -4766,6 +4950,7 @@ msgid "Invoice Lines"
 msgstr "Редове на фактура"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr ""
@@ -4807,7 +4992,8 @@ msgid "Reporting"
 msgstr "Справки"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -4838,7 +5024,8 @@ msgid "Configuration"
 msgstr "Настройка"
 
 #. module: account
-#: view:account.analytic.line:0 view:account.invoice:0
+#: view:account.analytic.line:0
+#: view:account.invoice:0
 msgid "Total amount"
 msgstr "Обща сума"
 
@@ -4888,12 +5075,14 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Дефиниция на данък"
 
 #. module: account
-#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0
+#: field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Група данъци"
 
@@ -4928,12 +5117,14 @@ msgid "Maintains Invoice sequences with Fiscal Year"
 msgstr ""
 
 #. module: account
-#: selection:account.balance.account.balance.report,init,account_choice:0
+#: selection:account.account.balance.report,checktype,display_account:0
+#: selection:account.general.ledger.report,checktype,display_account:0
 msgid "With movements"
-msgstr "С движения"
+msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0 field:account.tax.template,domain:0
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Домейн"
 
@@ -4958,7 +5149,9 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -4975,7 +5168,8 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Ред от фактура"
 
@@ -5026,7 +5220,8 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 field:account.invoice,payment_ids:0
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5072,9 +5267,12 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.move,state:0
-#: selection:account.move.line,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.move,state:0
+#: selection:account.move.line,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Проект"
@@ -5101,7 +5299,8 @@ msgid "Are you sure ?"
 msgstr "Сигурни ли сте?"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Проформа"
 
@@ -5137,16 +5336,20 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Optional Information"
 msgstr "Допълнителна информация"
 
@@ -5162,7 +5365,8 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.general.journal:0
+#: rml:account.account.balance:0
+#: rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5185,7 +5389,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Изчисление"
@@ -5219,7 +5424,6 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5229,7 +5433,8 @@ msgid "End of period"
 msgstr "Край на периода"
 
 #. module: account
-#: view:account.move:0 model:ir.model,name:account.model_account_move
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Запис от сметка"
 
@@ -5240,7 +5445,8 @@ msgid "General Journal"
 msgstr "Главен дневник"
 
 #. module: account
-#: field:account.account,balance:0 rml:account.account.balance:0
+#: field:account.account,balance:0
+#: rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5248,9 +5454,12 @@ msgstr "Главен дневник"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0 field:account.move.line,balance:0
-#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0 rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: rml:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Баланс"
@@ -5296,8 +5505,11 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "Последователността използвана за номера на фактури в този дневник."
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.journal:0 view:account.move:0 view:account.move.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "General Information"
 msgstr "Обща информация"
 
@@ -5336,7 +5548,8 @@ msgid "List of Accounts"
 msgstr "Списък със сметки"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5401,7 +5614,6 @@ msgstr "Финансова година за затваряне"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5429,11 +5641,15 @@ msgstr "Интраком"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
-#: field:account.invoice,name:0 field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0
+#: rml:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0 field:account.payment.term,note:0
-#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
+#: rml:account.overdue:0
+#: field:account.payment.term,note:0
+#: field:account.tax.code,info:0
+#: field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Описание"
 
@@ -5477,7 +5693,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Код на казус"
 
@@ -5559,7 +5776,8 @@ msgstr "Определения на модели"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Cash"
 msgstr "В брой"
 
@@ -5599,7 +5817,8 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Обезщетение на доставчик"
 
@@ -5646,8 +5865,10 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5681,8 +5902,10 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0 view:account.payment.term:0
-#: field:account.payment.term,name:0 view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5741,7 +5964,8 @@ msgstr "Да"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid "Check this if the user is allowed to reconcile entries in this account."
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Отбележете тук, ако на потребителя е разрешено да съгласува записи в тази "
 "сметка."
@@ -5768,7 +5992,8 @@ msgid "Accounting Dashboard"
 msgstr ""
 
 #. module: account
-#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
 msgstr ""
 
@@ -5811,12 +6036,12 @@ msgstr ""
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
 msgid "Show Debit/Credit Information"
-msgstr "Покажи информация относно Дебит/Кредит"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr "Всички сметки"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
@@ -5827,48 +6052,48 @@ msgstr ""
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr "Известяване"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr "Финансов период"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr "Баланс по сметка"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr "Избери период(и)"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr "Процент"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Compare Selected Years In Terms Of"
-msgstr "Сравни избраните години по критерий"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr "Избери фискална година(и) (максимум три години"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
 msgid "Select Reference Account(for  % comparision)"
-msgstr "Изберете сметка за отпратка(за % сравняване)"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr "Баланс на сметка - сравняване на години"
+msgstr ""
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -5900,7 +6125,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr "Показване на справка в хоризонтална форма"
+msgstr ""
 
 #. module: account
 #: rml:account.account.balance.landscape:0
@@ -5911,32 +6136,32 @@ msgstr ""
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
 msgid "Show Comparision in %"
-msgstr "Покажи сравнението в %"
+msgstr ""
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
-msgstr "Изберете период"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr "Настройки на справка"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr "Да не се сравняват"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr "Покажи сметки"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "1. You have selected more than 3 years in any case."
-msgstr "1. Избрахте повече от 3 години във всеки случай."
+msgstr ""
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -5947,12 +6172,12 @@ msgstr ""
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr "Година :"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You can select maximum 3 years. Please check again."
-msgstr "Може да изберете максимум 3 години. Моля проверете отново."
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -5975,7 +6200,7 @@ msgstr ""
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr "Дата на създаване"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -5987,20 +6212,20 @@ msgstr ""
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid ""
-"You may have selected the compare options with more than 1 year with credit/"
-"debit columns and % option.This can lead contents to be printed out of the "
-"paper.Please try again."
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
 msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr "Трябва да изберете поне една финансова година. Опитайте отново."
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Customize Report"
-msgstr "Настройка на справка"
+msgstr ""
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -6008,12 +6233,12 @@ msgid "Month Range"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_invoice_created
+#: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
@@ -6028,12 +6253,12 @@ msgid "Accounts by type"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_aged_receivable
+#: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_account_receivable
+#: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
 msgstr ""
 
@@ -6043,18 +6268,18 @@ msgid "Range"
 msgstr ""
 
 #. module: account
-#: model:ir.module.module,description:account.module_meta_information
+#: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
 msgstr ""
 
 #. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_receivable_graph
-#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
 msgstr ""
 
@@ -6069,7 +6294,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
 msgstr ""
@@ -6078,3 +6303,322 @@ msgstr ""
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
 msgstr ""
+
+#, python-format
+#~ msgid ""
+#~ "Specified Journal does not have any account move entries in draft state for "
+#~ "this period"
+#~ msgstr ""
+#~ "Посоченият дневник няма сметка с движения в състояние проект за този период"
+
+#, python-format
+#~ msgid "Account move line \"%s\" is not valid"
+#~ msgstr "Ред \"%s\" от движение по сметка не е валиден"
+
+#, python-format
+#~ msgid "Sales Journal"
+#~ msgstr "Дневник продажби"
+
+#, python-format
+#~ msgid "No Period found on Invoice!"
+#~ msgstr "Не е намерен период за фактура!"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Предупреждение !"
+
+#, python-format
+#~ msgid "Can not %s draft/proforma/cancel invoice."
+#~ msgstr "Не може да %s проект/проформа/отказ на фактура"
+
+#, python-format
+#~ msgid "Bank Journal "
+#~ msgstr "Банков дневник "
+
+#, python-format
+#~ msgid "You must first select a partner !"
+#~ msgstr "Първо трябва да изберете партньор !"
+
+#, python-format
+#~ msgid "No Data Available"
+#~ msgstr "Няма налични данни"
+
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "Грешка за цялостност !"
+
+#, python-format
+#~ msgid "No journal for ending writing has been defined for the fiscal year"
+#~ msgstr "Не е зададен дневник за краен запис за финансовата година"
+
+#, python-format
+#~ msgid "You have to provide an account for the write off entry !"
+#~ msgstr "Трябва да изберете сметка за записа на отписването !"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "Не е аналитичен дневник !"
+
+#, python-format
+#~ msgid "No period found !"
+#~ msgstr "Не е намерен период !"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a reconciled entry ! Please note that "
+#~ "you can just change some non important fields !"
+#~ msgstr ""
+#~ "Не може да извършите това върху приравнен запис ! Моля отбележете че може "
+#~ "само да промените само някои неважни полета !"
+
+#, python-format
+#~ msgid "You must select accounts to reconcile"
+#~ msgstr "Трябва да изберете сметки за изравняване"
+
+#, python-format
+#~ msgid "Cannot create invoice move on centralised journal"
+#~ msgstr ""
+#~ "Не може да бъде създадено движение на фактура върху централизиран дневник"
+
+#, python-format
+#~ msgid "No Partner Defined !"
+#~ msgstr "Не е зададен партньор !"
+
+#, python-format
+#~ msgid "Purchase Journal"
+#~ msgstr "Дневник за поръчки"
+
+#, python-format
+#~ msgid "Free Reference"
+#~ msgstr "Свободна отпратка"
+
+#, python-format
+#~ msgid "Entries are not of the same account or already reconciled ! "
+#~ msgstr "Записите не са от същата сметка или не са изравнени ! "
+
+#, python-format
+#~ msgid "You can not use this general account in this journal !"
+#~ msgstr "Не може да използвате главна сметка за този дневник !"
+
+#, python-format
+#~ msgid ""
+#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
+#~ msgstr "Очаквания баланс (%.2f) е различен от изчисления. (%.2f)"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a confirmed entry ! Please note that you "
+#~ "can just change some non important fields !"
+#~ msgstr ""
+#~ "Не може да извършите това върху потвърден запис ! Моля отбележете че може "
+#~ "само да промените само някои неважни полета !"
+
+#, python-format
+#~ msgid "Invalid action !"
+#~ msgstr "Невалидно действие !"
+
+#, python-format
+#~ msgid "Cannot delete invoice(s) that are already opened or paid !"
+#~ msgstr "Не може да изтриете фактура(и) които вече са отворени или платени !"
+
+#, python-format
+#~ msgid "Your journal must have a default credit and debit account."
+#~ msgstr ""
+#~ "Вашия дневник трябва да има по подразбиране сметки за дебит и кредит."
+
+#, python-format
+#~ msgid "You can not add/modify entries in a closed journal."
+#~ msgstr "Не може да добавяте/променяте записи в затворен дневник."
+
+#, python-format
+#~ msgid "No sequence defined in the journal !"
+#~ msgstr "Не са зададени последоватености за този дневник !"
+
+#, python-format
+#~ msgid "The opening journal must not have any entry in the new fiscal year !"
+#~ msgstr ""
+#~ "Отваряния дневник не трябва да има запис за новата финансова година !"
+
+#, python-format
+#~ msgid "Unable to find a valid period !"
+#~ msgstr "Не може да бъде намерен валиден период !"
+
+#, python-format
+#~ msgid "The journal must have default credit and debit account"
+#~ msgstr "Дневника трябва да има сметки по подрабиране за кредит и дебит"
+
+#, python-format
+#~ msgid "Some entries are already reconciled !"
+#~ msgstr "Някой записи вече са били приравнени !"
+
+#, python-format
+#~ msgid "No Analytic Journal !"
+#~ msgstr "Не е аналитичен дневник !"
+
+#, python-format
+#~ msgid "Already Reconciled"
+#~ msgstr "Вече приравнен"
+
+#, python-format
+#~ msgid "Unable to change tax !"
+#~ msgstr "Не може да се сменя данъка !"
+
+#, python-format
+#~ msgid "Unable to reconcile entry \"%s\": %.2f"
+#~ msgstr "Не може да приравни запис %s\": %.2f"
+
+#, python-format
+#~ msgid "Please set an analytic journal on this financial journal !"
+#~ msgstr "Моля изберете аналитичен дневник за този финансов дневник !"
+
+#, python-format
+#~ msgid "Date to must be set between %s and %s"
+#~ msgstr "Датата трябва да бъде между %s и %s"
+
+#, python-format
+#~ msgid "You can not delete posted movement: \"%s\"!"
+#~ msgstr "Не може да изтриете публикувано движение: \"%s\"!"
+
+#, python-format
+#~ msgid ""
+#~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+#~ "defined !"
+#~ msgstr ""
+#~ "Условията за плащане на доставчика нямат зададени редове за условия за "
+#~ "плащане (изчисление) !"
+
+#, python-format
+#~ msgid "The account entries lines are not in valid state."
+#~ msgstr "Редовете на записите на сметката не са във валидно състояние."
+
+#, python-format
+#~ msgid "No records found for your selection!"
+#~ msgstr "Няма намерен данък за вашия избор"
+
+#, python-format
+#~ msgid "You can not modify/delete a journal with entries for this period !"
+#~ msgstr "Не може да променяте/узтривате дневник със записи от този период !"
+
+#, python-format
+#~ msgid "Invoice is already reconciled"
+#~ msgstr "Фактурата вече е приравнена"
+
+#, python-format
+#~ msgid "Entries: "
+#~ msgstr "Записи: "
+
+#, python-format
+#~ msgid "You can not change the tax, you should remove and recreate lines !"
+#~ msgstr ""
+#~ "Не може да промените данъка, трябва да изтриете и създадете отново редовете !"
+
+#, python-format
+#~ msgid "Couldn't create move between different companies"
+#~ msgstr "Не може да създаде движение между различни фирми"
+
+#, python-format
+#~ msgid "Entry \"%s\" is not valid !"
+#~ msgstr "Запис \"%s\" е невалиден !"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Грешка!"
+
+#, python-format
+#~ msgid "Global taxes defined, but are not in invoice lines !"
+#~ msgstr "Общите данъци са зададени, но не са в редовете на фактурата !"
+
+#, python-format
+#~ msgid "Bad total !"
+#~ msgstr "Грешна обща сума !"
+
+#, python-format
+#~ msgid "The journal must have centralised counterpart"
+#~ msgstr "Дневника трябва да има централно копие"
+
+#, python-format
+#~ msgid "End of Fiscal Year Entry"
+#~ msgstr "Запис за край на финансова година"
+
+#, python-format
+#~ msgid "Data Insufficient !"
+#~ msgstr "Недостатъчни данни !"
+
+#, python-format
+#~ msgid "Can not pay draft/proforma/cancel invoice."
+#~ msgstr "Не може да бъде платена  проект/проформа/отказана фактура."
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "Потребителска грешка"
+
+#, python-format
+#~ msgid "Date not in a defined fiscal year"
+#~ msgstr "Датата не е в зададената финансова година"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Предупреждение"
+
+#, python-format
+#~ msgid "Please verify that an account is defined in the journal."
+#~ msgstr "Моля проверете че в дневника е зададена сметка"
+
+#, python-format
+#~ msgid "You can not use an inactive account!"
+#~ msgstr "Не може да използвате неактивна сметка!"
+
+#, python-format
+#~ msgid "Entry is already reconciled"
+#~ msgstr "Записа вече е приравнен"
+
+#, python-format
+#~ msgid ""
+#~ "Selected Move lines does not have any account move enties in draft state"
+#~ msgstr ""
+#~ "Избраните редове от движения нямат движения по сметка в състояние проект"
+
+#, python-format
+#~ msgid "This period is already closed !"
+#~ msgstr "Този период вече е затворен !"
+
+#, python-format
+#~ msgid "Bad account!"
+#~ msgstr "Грешна сметка!"
+
+#, python-format
+#~ msgid "Standard Encoding"
+#~ msgstr "Стандартно кодиране"
+
+#, python-format
+#~ msgid "You must define an analytic journal of type '%s' !"
+#~ msgstr "Трябва да зададете аналитичен дневник от вид '%s' !"
+
+#, python-format
+#~ msgid "Bad account !"
+#~ msgstr "Грешна сметка !"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Грешка"
+
+#, python-format
+#~ msgid "Taxes missing !"
+#~ msgstr "Липсват данъци !"
+
+#, python-format
+#~ msgid "Closing of fiscal year cancelled, please check the box !"
+#~ msgstr "Затварянето на финансовата година прекратено, моля отменете полето !"
+
+#, python-format
+#~ msgid "You must enter a period length that cannot be 0 or below !"
+#~ msgstr ""
+#~ "Трябва да въведете дължина на период, която не може да бъде 0 или по-малко."
+
+#, python-format
+#~ msgid "No piece number !"
+#~ msgstr "Няма номер на цена !"
+
+#, python-format
+#~ msgid "You have to define an analytic journal on the '%s' journal!"
+#~ msgstr "Трябва да зададете аналитичен дневник в '%s' дневник!"
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 2acdb44977c..4bc36b56132 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-07 08:48+0000\n"
+"PO-Revision-Date: 2010-08-01 11:48+0000\n"
 "Last-Translator: Bojan Markovic <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-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -35,7 +35,7 @@ msgstr "Neplaćeni ulazni računi"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
-msgstr ""
+msgstr "Kodiranje unosa"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
@@ -192,8 +192,6 @@ msgstr "Odabir retka prijenosa"
 #. module: account
 #: rml:account.journal.period.print:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Oznaka unosa"
 
@@ -217,7 +215,7 @@ msgstr "Kod za izračunavanje (ako je tip=Python kod)"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr "Redak računa"
+msgstr "Linija stavke računa"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
@@ -238,7 +236,6 @@ msgstr "Ponavljajuće stavke"
 #: field:account.move,amount:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
-#: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Iznos"
 
@@ -286,6 +283,11 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
+"Ukoliko koristite uvjete plaćanja, datum dospijeća biti će izračunat "
+"automatski prilikom generiranja računovodstvenih unosa. Ukoliko ostavite "
+"uvjete plaćanja i datum dospijeća praznim, to znači avansnu uplatu. Uvjeti "
+"plaćanja mogu izračunati nekoliko datuma dospijeća npr. 50% avansno, 50% za "
+"30 dana."
 
 #. module: account
 #: selection:account.tax,type:0
@@ -302,7 +304,6 @@ msgstr "Dospijela plaćanja"
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -342,6 +343,7 @@ msgid "Delta Debit"
 msgstr "Delta duguje"
 
 #. module: account
+#: model:account.account.type,name:account.account_type_tax
 #: rml:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -356,7 +358,9 @@ msgstr "Dugovna transakcija"
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Analitičko konto"
@@ -429,7 +433,7 @@ msgstr "Negativan"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "Naziv (Konta/Partnera)"
 
 #. module: account
 #: selection:account.move,type:0
@@ -487,7 +491,7 @@ msgstr "Referenca"
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr ""
+msgstr "Upotreba poreza u"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -495,11 +499,13 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
+"Postaviti ako se iznos poreza mora uključiti u osnovicu prije izračuna "
+"narednih poreza."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr ""
+msgstr "Periodička obrada"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
@@ -612,6 +618,8 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
 msgstr ""
+"Polje sekvence se koristi da se resursi poredaju od najnižih sekvenci ka "
+"višima"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -674,8 +682,11 @@ msgstr "Sub-Total :"
 #. module: account
 #: field:account.analytic.account,line_ids:0
 #: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Analitičke stavke"
 
@@ -687,9 +698,10 @@ msgstr "Mjesec"
 #. module: account
 #: field:account.analytic.account,partner_id:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Vezani partner"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Dodatne informacije"
@@ -828,6 +840,8 @@ msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
 msgstr ""
+"Ovi tipovi su definirani prema vašoj zemlji. Tip sadrži više informacija o "
+"jednom kontu i njegovim specifičnostima."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -912,6 +926,8 @@ msgid ""
 "If a default tax is given in the partner it only overrides taxes from "
 "accounts (or products) in the same group."
 msgstr ""
+"Ako je podrazumijevani porez definiran kod partnera, on samo prepisuje "
+"poreze iz konta (ili proizvoda) iz iste grupe."
 
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
@@ -1121,7 +1137,7 @@ msgstr "Konto kategorije dobiti"
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr "Novi analitički konto"
+msgstr "Novo analitičko konto"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -1216,6 +1232,11 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
+"Ovo će odabrati kako se trenutni kurs valute za izlazne transakcije računa. "
+"U većini zemalja zakonska metoda je \"prosječni kurs\" ali samo nekolicina "
+"softverskih sistema to rade. Tako da, ukoliko uvozite podatke iz drugog "
+"softverskog sistema, možda ćete morati koristiti dnevni kurs. Ulazne "
+"transakcije uvijek koriste dnevni kurs."
 
 #. module: account
 #: field:account.account,company_currency_id:0
@@ -1225,7 +1246,7 @@ msgstr "Valuta preduzeća"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Fiscal Position Template Account Mapping"
-msgstr ""
+msgstr "Mapiranje fiskalne pozicije na konto predloška"
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1463,6 +1484,9 @@ msgstr "Ne popunjavati za upotrebu računa za prihod"
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr "Otpis"
 
@@ -1472,6 +1496,8 @@ msgid ""
 "The partner bank account to pay\n"
 "Keep empty to use the default"
 msgstr ""
+"Bankovni račun partnera na koji se vrši plaćanje\n"
+"Ostaviti prazno da koristite podrazumijevani"
 
 #. module: account
 #: field:res.partner,debit:0
@@ -1868,7 +1894,6 @@ msgstr "x Nalog za knjiženje knjižnih odobrenja troškova"
 #: field:account.journal,type:0
 #: field:account.move,type:0
 #: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
 msgid "Type"
 msgstr "Tip"
 
@@ -1992,7 +2017,7 @@ msgstr "          Početni datum"
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Analitički izvještaj knjiženja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -2028,6 +2053,8 @@ msgid ""
 "'draft' state and instead goes directly to the 'posted state' without any "
 "manual validation."
 msgstr ""
+"Označite ovo ako ne želite da nova knjiženja konta prolaze kroz stanje 'u "
+"izradi' nego da direktno idu u 'proknjiženo' stanje bez ručne validacije."
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -2062,7 +2089,7 @@ msgstr "Trošak"
 #. module: account
 #: field:account.journal,invoice_sequence_id:0
 msgid "Invoice Sequence"
-msgstr ""
+msgstr "Sekvenca fakture"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
@@ -2077,7 +2104,7 @@ msgstr "Proces fakturiranja kupcu"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Napomena za fiskalnu poziciju"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2290,11 +2317,12 @@ msgstr "2"
 #: wizard_view:account.chart,init:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
 msgstr ""
+"(ako ne odaberete fiskalnu godinu uzeti će sve otvorene fiskalne godine)"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "Osnovni konto porezne prijave."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2306,13 +2334,13 @@ msgstr ""
 #: selection:account.general.ledger.report,checktype,sortbydate:0
 #: rml:account.journal.period.print:0
 #: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
 #: field:account.subscription.line,date:0
 #: rml:account.tax.code.entries:0
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
 msgid "Date"
 msgstr "Datum"
 
@@ -2369,12 +2397,12 @@ msgstr "Broj jamca"
 #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic reconciliation"
-msgstr ""
+msgstr "Automatsko izjednačenje"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Import Invoice"
-msgstr ""
+msgstr "Uvezi fakturu"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -2402,6 +2430,8 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
+"Postaviti ako je izračun poreza baziran na izračunu podporeza a ne na "
+"ukupnom iznosu."
 
 #. module: account
 #: rml:account.central.journal:0
@@ -2414,6 +2444,8 @@ msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
 msgstr ""
+"Ukoliko nije izvedivo (računa se u Python kodu), porez se neće pojaviti na "
+"fakturi."
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -2429,6 +2461,7 @@ msgstr "Završni datum"
 #: view:account.bank.statement:0
 #: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
@@ -2618,9 +2651,12 @@ msgstr "Nalog za plaćanje"
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
 msgstr ""
+"Označite ovu opciju ako želite da korisnik izjednači unose u ovaj konto."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2661,6 +2697,11 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for deprecated "
 "accounts."
 msgstr ""
+"Ovaj tip se koristi za difirencijaciju tipova sa posebnim efektima u Open "
+"ERP-u: pogled ne može imati unose, konsolidacije su konta koja imaju "
+"podkonta za više-kompanijske konsolidacije, dugovanja/potraživanja su za "
+"partnerska konta (za izračun duga/potraživanja), zatvorena su za konta koja "
+"izlaze iz upotrebe."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
@@ -2692,7 +2733,7 @@ msgstr "Cijena"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2724,6 +2765,7 @@ msgid "Invoice Number"
 msgstr "Broj fakture"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr "Kraj Perioda"
@@ -2910,8 +2952,6 @@ msgstr "Puno ime konta"
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
@@ -2930,7 +2970,7 @@ msgstr "Računovodstveni izvod"
 #. module: account
 #: rml:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr ""
+msgstr "Dokument: Izvještaj konta kupca"
 
 #. module: account
 #: view:product.product:0
@@ -2968,9 +3008,11 @@ msgstr "Stavke unosa"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr "Usklađivanje"
 
@@ -3032,7 +3074,6 @@ msgstr "Stanje"
 
 #. module: account
 #: rml:account.invoice:0
-#: xsl:account.transfer:0
 msgid "Document"
 msgstr "Dokument"
 
@@ -3057,6 +3098,8 @@ msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
+"Ukoliko je ovo polje označeno sistem će pokušati da grupira unose knjiženja "
+"kada ih generira iz faktura."
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
@@ -3080,6 +3123,8 @@ msgstr "Analitička knjiženja"
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr "Oznaka stavke"
 
@@ -3271,6 +3316,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr "Generiraj stavke za otvaranje fiskalne godine"
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr "Uskladi stavke"
@@ -3338,7 +3384,7 @@ msgstr "Saldo analitike"
 #. module: account
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr "Ukupno duguje"
+msgstr "Ukupan dug"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -3375,6 +3421,8 @@ msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
 msgstr ""
+"Ovaj konte će se koristiti umjesto podrazumijevanog kao konto potraživanja "
+"za trenutnog partnera"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -3516,7 +3564,7 @@ msgstr "Donešeni saldo"
 #. module: account
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr ""
+msgstr "Konsolidirani potomci"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,fiscalyear:0
@@ -3625,7 +3673,6 @@ msgstr ""
 "partnera."
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr "Naziv stavke"
@@ -3642,6 +3689,8 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
+"Označite ovo polje ako ne želite da se PDV vezan uz ovu poreznu šifru "
+"pojavljuje na fakturama."
 
 #. module: account
 #: field:account.account.type,sequence:0
@@ -3766,7 +3815,7 @@ msgstr "Fakture u pripremi"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Fiscal Position Template Tax Mapping"
-msgstr ""
+msgstr "Mapiranje fiskalne pozicije na predložak poreza"
 
 #. module: account
 #: rml:account.invoice:0
@@ -3797,6 +3846,15 @@ msgid ""
 "    Bank statements\n"
 "    "
 msgstr ""
+"Finansijski i računovodstveni modul koji pokriva:\n"
+"    Glavno računovodstvo\n"
+"    Troškovno / analitičko računovodstvo\n"
+"    Računovodstvo trećih strana\n"
+"    Upravljanje porezima\n"
+"    Budžetiranje\n"
+"    Ulazne i izlazne fakture\n"
+"    Bankovne izvode\n"
+"    "
 
 #. module: account
 #: field:account.journal,sequence_id:0
@@ -3817,7 +3875,7 @@ msgstr "Stavke plaćanja"
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or tax code account."
-msgstr ""
+msgstr "Ovaj konto može biti ili konto poreske osnovice ili konto poreza."
 
 #. module: account
 #: help:account.automatic.reconcile,init,account_ids:0
@@ -3832,7 +3890,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
 #: view:wizard.company.setup:0
 msgid "Overdue Payment Report Message"
-msgstr ""
+msgstr "Poruka izvještaja dospjelih dugovanja"
 
 #. module: account
 #: selection:account.tax,tax_group:0
@@ -3856,7 +3914,7 @@ msgstr "Kolone"
 #. module: account
 #: selection:account.general.ledger.report,checktype,sortbydate:0
 msgid "Movement"
-msgstr ""
+msgstr "Knjiženje"
 
 #. module: account
 #: help:account.period,special:0
@@ -3869,6 +3927,8 @@ msgid ""
 "This account will be used instead of the default one to value outgoing stock "
 "for the current product"
 msgstr ""
+"Ovaj konto će se koristiti umjesto podrazumijevanog za vrijednovanje "
+"izlaznih količina trenutnog proizvoda."
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -3892,7 +3952,7 @@ msgstr "Po razdoblju"
 #. module: account
 #: help:account.invoice,date_invoice:0
 msgid "Keep empty to use the current date"
-msgstr ""
+msgstr "Ostaviti prazno da se koristi današnji datum"
 
 #. module: account
 #: rml:account.overdue:0
@@ -4405,6 +4465,9 @@ msgid ""
 "to the higher ones. The order is important if you have a tax with several "
 "tax children. In this case, the evaluation order is important."
 msgstr ""
+"Polje sekvence koristi se da se poreske stavke poredaju od najniže sekvence "
+"ka višima. Redoslijed je bitan ukoliko imate porez sa više podporeza. U ovom "
+"slučaju, bitan je redosljed evaluacije."
 
 #. module: account
 #: view:account.tax:0
@@ -4455,7 +4518,7 @@ msgstr "Jeste sigurni da želite otvoriti ovu fakturu ?"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 msgid "Partner Other Ledger"
-msgstr ""
+msgstr "Druga knjiga partnera"
 
 #. module: account
 #: view:res.partner:0
@@ -4465,7 +4528,7 @@ msgstr "Dugovanje dobavljaču"
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries"
-msgstr ""
+msgstr "Opcionalna količina na unosima"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -4758,6 +4821,9 @@ msgid ""
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
 msgstr ""
+"Označite ovo polje da odredite da svaka unesena u ovu knjigu neće kreirati "
+"novu nego će koristiti istu protustavku. Ovo se koristi prilikom zatvaranja "
+"fiskalne godine."
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4955,6 +5021,7 @@ msgid "Invoice Lines"
 msgstr "Retci fakture"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr "Početak Perioda"
@@ -5223,7 +5290,7 @@ msgstr "Predznak u izvješćima"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr ""
+msgstr "Opcionalna druga valuta ako je u pitanju viševalutni unos."
 
 #. module: account
 #: view:account.invoice:0
@@ -5255,7 +5322,7 @@ msgstr "Sve stavke konta"
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
 msgid "The tax basis of the tax declaration."
-msgstr ""
+msgstr "Poreska osnovica za poreznu deklaraciju."
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -5349,8 +5416,6 @@ msgstr "Proces fakturiranja dobavljača"
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Stranica"
@@ -5395,6 +5460,8 @@ msgid ""
 "amount.If the tax account is base tax code,                    this field "
 "will contain the basic amount(without tax)."
 msgstr ""
+"Ako je ovaj konto konto poreza, ovo polje sadrži oporezovani iznos. Ako je "
+"polje konto osnovice, ovo polje sadrži samo iznos osnovice (bez poreza)."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5411,7 +5478,7 @@ msgstr "Račun prihoda ili troškova vezan za odabrani proizvod."
 #. module: account
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
-msgstr ""
+msgstr "Porezna prijava"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
@@ -5432,7 +5499,6 @@ msgstr "Broj perioda"
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5505,11 +5571,13 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
+"Neispravan period ! Došlo je do preklapanja perioda ili period nije u sklopu "
+"fiskalne godine. "
 
 #. module: account
 #: help:account.journal,invoice_sequence_id:0
 msgid "The sequence used for invoice numbers in this journal."
-msgstr ""
+msgstr "Sekvence korištene za brojeve faktura u ovoj knjizi."
 
 #. module: account
 #: view:account.account:0
@@ -5624,7 +5692,6 @@ msgstr "Fiskalna godina za zatvaranje"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5670,11 +5737,13 @@ msgid ""
 "This account will be used instead of the default one to value incoming stock "
 "for the current product"
 msgstr ""
+"Ovaj konto će se koristiti umjesto podrazumijevanog za vrijednost ulazne "
+"količine za trenutni proizvod."
 
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr ""
+msgstr "Konta potporeza."
 
 #. module: account
 #: field:account.account,parent_right:0
@@ -5702,6 +5771,8 @@ msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
 msgstr ""
+"Ovaj konto se koristi umjesto podrazumijevanog kao konto dugovanja prema "
+"trenutnom partneru."
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -5954,6 +6025,8 @@ msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
 msgstr ""
+"Odaberite ovo ako cijena koju koristite na proizvodu i računima uključuje "
+"ovaj porez."
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -5987,30 +6060,30 @@ msgstr "Izračunaj datume stavaka"
 #. module: account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr ""
+msgstr "Analitička konta koja će biti zatvorena"
 
 #. module: account
 #: view:board.board:0
 msgid "Draft invoices"
-msgstr ""
+msgstr "Predračuni"
 
 #. 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 "Računovodstvena kontrolna tabla"
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "Konta za fakturisanje"
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr ""
+msgstr "Troškovi za fakturisanje"
 
 #. module: account
 #: view:board.board:0
@@ -6025,84 +6098,84 @@ msgstr "Tabla za računovođu"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr ""
+msgstr "Konta prihoda"
 
 #. module: account
 #: view:board.board:0
 msgid "My indicators"
-msgstr ""
+msgstr "Moji indikatori"
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Tabla konta"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "Zastarjeli prihodi"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
 msgid "Show Debit/Credit Information"
-msgstr ""
+msgstr "Prikaži duguje/potražuje podatke"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr ""
+msgstr "Sva konta"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
 msgid "Entries Selection Based on"
-msgstr ""
+msgstr "Odabir stavki zasnovan na"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr ""
+msgstr "Obavijest"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr ""
+msgstr "Financijski period"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "Saldo konta"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr ""
+msgstr "Odaberite periode"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr ""
+msgstr "Postotak"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Compare Selected Years In Terms Of"
-msgstr ""
+msgstr "Usporedi odabrane godine pod slijedećim uvjetima:"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr ""
+msgstr "Odaberite fiskalne godine (Maksimalno 3 godine)"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
 msgid "Select Reference Account(for  % comparision)"
-msgstr ""
+msgstr "Odaberite referentna konta (za poređenje u %)"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "Saldo konta - poređenje godina"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6125,68 +6198,84 @@ msgid ""
 "    5. You have an option to print the desired report in Landscape format.\n"
 "    "
 msgstr ""
+"Modul za računovodstvene bilanse je dodatna funkcionalnost modula "
+"finansijskog upravljanja.\n"
+"\n"
+"    Ovaj modul nudi slijedeće mogućnosti za printanje bilansi.\n"
+"\n"
+"    1. Možete porediti bilanse različitih godina.\n"
+"\n"
+"    2. Možete odabrati poređenje po novcu ili procentualno.\n"
+"\n"
+"    3. Možete odabrati referentna konta za procentualno poređenje za "
+"određenje godine.\n"
+"\n"
+"    4. Možete odabrati periode stvarnog datuma ili periode datuma unosa.\n"
+"\n"
+"    5. Imate mogućnost ispisa željenog izvještaja u položenom formatu.\n"
+"    "
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You have to select 'Landscape' option. Please Check it."
-msgstr ""
+msgstr "Morate odabrati opciju 'Položeno'. Molimo označite je."
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "Prikaži izvješće u položenoj formi"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
 msgid "Show Comparision in %"
-msgstr ""
+msgstr "Prikaži usporedbu u %"
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
-msgstr ""
+msgstr "Odaberite Period"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "Postavke izvješća"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr ""
+msgstr "Ne uspoređuj"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr ""
+msgstr "Prikaži konta"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "1. You have selected more than 3 years in any case."
-msgstr ""
+msgstr "1. Odabrali ste više od 3 godine u svakom slučaju."
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "Upravljanje računovodstvom i finansijama - Usporedi konta"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Godina :"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You can select maximum 3 years. Please check again."
-msgstr ""
+msgstr "Možete odabrati maksimalno 3 godine. Molimo pokušajte ponovno."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6194,6 +6283,8 @@ msgid ""
 "3. You have selected 'Percentage' option with more than 2 years, but you "
 "have not selected landscape format."
 msgstr ""
+"3. Izabrali ste opciju \"Postotak\" sa više od dvije godine, ali niste "
+"odabrali \"Položeni\" format."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6205,12 +6296,12 @@ msgstr ""
 #. module: account
 #: help:account.balance.account.balance.report,init,select_account:0
 msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "Ostavite prazno za usporedbu sa roditeljem"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6218,6 +6309,7 @@ msgid ""
 "2. You have not selected 'Percentage' option, but you have selected more "
 "than 2 years."
 msgstr ""
+"2. Niste odabrali opciju 'Postotak', ali ste odabrali više od 2 godine."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
@@ -6226,26 +6318,29 @@ msgid ""
 "credit/debit columns and % option.This can lead contents to be printed out "
 "of the paper.Please try again."
 msgstr ""
+"Postoji mogućnost da ste odabrali postavke usporedbe sa više od 1 godine sa "
+"stupcima duguje/potražuje i % opcijom. Ovo može biti uzrok ispisa van "
+"papira. Molimo pokušajte ponovno."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr ""
+msgstr "Morate odabrati bar 1 fiskalnu godinu. Pokušajte ponovno."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "Prilagodite izvješće"
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Raspon mjeseci"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Fakture unesene u zadnjih 15 dana"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_invoice_created
@@ -6255,61 +6350,65 @@ msgstr "Izvještaj o fakturama unesenim u zadnjih 15 dana"
 #. module: account
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Ukupan iznos"
 
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "Konta po vrstama"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Zastarjela potraživanja do danas"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "Konta potraživanja"
 
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Raspon"
 
 #. module: account
 #: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
 msgstr ""
+"Modul koji dodaje nove izvještaje baziran na računovodstvenom modulu."
 
 #. module: account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "Računovodstveno izvještavanje - izvještavanje."
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Saldo po vrsti konta"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "Sedmica u godini"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Datum unosa"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "Zastarjela potraživanja"
 
 #. module: account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Neoporezovan iznos"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 978b1adc6fd..a2f90b4f404 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* account
+#	* account
 #
 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"
-"PO-Revision-Date: 2010-04-08 18:06+0000\n"
-"Last-Translator: mitev.dmitry <Unknown>\n"
+"PO-Revision-Date: 2010-07-13 10:25+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-06-22 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -73,6 +73,8 @@ msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
 msgstr ""
+"Tento účet bude použit pro hodnoty příchozích zásob pro aktuální kategorii "
+"výrobků"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -90,7 +92,8 @@ msgid "Unreconciled entries"
 msgstr "Nesmířené částky"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Základní kód"
@@ -122,7 +125,8 @@ msgid "Residual"
 msgstr "Zbytek"
 
 #. module: account
-#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -183,8 +187,8 @@ msgid "Move line select"
 msgstr "Přesun řádku vyberte"
 
 #. module: account
-#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0
+#: rml:account.tax.code.entries:0
 msgid "Entry label"
 msgstr "Vložení štítku"
 
@@ -199,12 +203,14 @@ msgid "Period Sum"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Account Entry Line"
 msgstr ""
 
@@ -221,10 +227,12 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
-#: field:account.invoice.tax,amount:0 field:account.move,amount:0
-#: field:account.tax,amount:0 field:account.tax.template,amount:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.reconcile.line,amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: field:account.move,amount:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
 msgid "Amount"
 msgstr "Částka"
 
@@ -260,7 +268,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -269,19 +278,20 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0 selection:account.tax.template,type:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Pevné"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
 msgid "Overdue Payments"
 msgstr "Zpožděné platby"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -290,7 +300,8 @@ msgid "Select period"
 msgstr "Vyberte období"
 
 #. module: account
-#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Původ"
 
@@ -320,7 +331,9 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice,amount_tax:0
+#: model:account.account.type,name:account.account_type_tax
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Daň"
@@ -333,18 +346,22 @@ msgstr "Debetní transakce"
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Analytický účet"
 
 #. module: account
-#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Daň z dětí"
 
 #. module: account
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Název časopisu"
@@ -412,8 +429,11 @@ msgid "Contra"
 msgstr "Kontraindikace"
 
 #. module: account
-#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
-#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
+#: field:account.analytic.account,state:0
+#: field:account.bank.statement,state:0
+#: field:account.invoice,state:0
+#: view:account.move:0
+#: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Země"
@@ -425,7 +445,8 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Speciální výpočetní"
 
@@ -447,8 +468,10 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0 field:account.model,ref:0
-#: field:account.move,ref:0 rml:account.overdue:0
+#: rml:account.general.ledger:0
+#: field:account.model,ref:0
+#: field:account.move,ref:0
+#: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr ""
@@ -639,9 +662,13 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0
+#: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Analytická Příspěvky"
 
@@ -656,6 +683,7 @@ msgid "Associated Partner"
 msgstr "Přidruženého partnera"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Další informace"
@@ -671,7 +699,8 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -703,7 +732,8 @@ msgid "Field Name"
 msgstr "Název pole"
 
 #. module: account
-#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0
+#: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Přihlaste se na mateřské"
 
@@ -713,7 +743,8 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Purchase Properties"
 msgstr "Nákup Nemovitosti"
 
@@ -733,9 +764,12 @@ msgid "Move Lines Created."
 msgstr "Přesun vytvořených linek."
 
 #. module: account
-#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
-#: field:account.move,state:0 field:account.move.line,state:0
-#: field:account.period,state:0 field:account.subscription,state:0
+#: field:account.fiscalyear,state:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: field:account.subscription,state:0
 msgid "Status"
 msgstr "Stav"
 
@@ -888,8 +922,10 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
-#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Množství"
@@ -932,13 +968,16 @@ msgstr "analytické faktury"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0 rml:account.general.journal:0
+#: view:account.fiscalyear:0
+#: rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0 field:account.move,period_id:0
+#: field:account.journal.period,period_id:0
+#: field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0
+#: view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -960,7 +999,8 @@ msgid "Net Total:"
 msgstr "Čistá celkem:"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1082,7 +1122,8 @@ msgid "Fiscal Position Templates"
 msgstr "Fiskální pozice Šablony"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Cena za kus"
 
@@ -1235,7 +1276,8 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1257,7 +1299,8 @@ msgid "Write-Off account"
 msgstr "Odpis účet"
 
 #. module: account
-#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0
+#: field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Vzor"
 
@@ -1283,9 +1326,11 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0
+#: field:account.journal,view_id:0
 msgid "View"
 msgstr "Pohled"
 
@@ -1354,7 +1399,8 @@ msgstr "Typy účtů"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1370,7 +1416,8 @@ msgid "Journal"
 msgstr "Časopis"
 
 #. module: account
-#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0
+#: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Dětská konta"
 
@@ -1396,7 +1443,8 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1405,6 +1453,9 @@ msgstr ""
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr "Odpis"
 
@@ -1523,7 +1574,8 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1533,7 +1585,8 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 field:account.model.line,partner_id:0
+#: rml:account.invoice:0
+#: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr ""
@@ -1545,12 +1598,14 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0 field:account.subscription,lines_id:0
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1714,7 +1769,8 @@ msgid "Period length (days)"
 msgstr "Délka období (dny)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
@@ -1725,7 +1781,8 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1771,9 +1828,21 @@ msgid "year"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.balance.account.balance.report,init,checkyear:0
+#: wizard_button:account.account.balance.report,checktype,report:0
+#: wizard_button:account.analytic.account.analytic.check.report,init,report:0
+#: wizard_button:account.analytic.account.balance.report,init,report:0
+#: wizard_button:account.analytic.account.cost_ledger.report,init,report:0
+#: wizard_button:account.analytic.account.inverted.balance.report,init,report:0
+#: wizard_button:account.analytic.account.journal.report,init,report:0
+#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,report:0
+#: wizard_button:account.central.journal.report,init,print:0
+#: wizard_button:account.general.journal.report,init,print:0
+#: wizard_button:account.general.ledger.report,checktype,checkreport:0
+#: wizard_button:account.partner.balance.report,init,report:0
+#: wizard_button:account.print.journal.report,init,print:0
+#: wizard_button:account.third_party_ledger.report,init,checkreport:0
 msgid "Print"
-msgstr "Tisk"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
@@ -1787,9 +1856,11 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
-#: field:account.journal,type:0 field:account.move,type:0
-#: field:account.move.reconcile,type:0 xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: field:account.journal,type:0
+#: field:account.move,type:0
+#: field:account.move.reconcile,type:0
 msgid "Type"
 msgstr ""
 
@@ -1937,7 +2008,8 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -1952,7 +2024,8 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2025,8 +2098,10 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
-#: field:account.journal,currency:0 field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.journal,currency:0
+#: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr ""
@@ -2064,7 +2139,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2116,7 +2192,8 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr ""
 
@@ -2179,9 +2256,13 @@ msgid "Date Invoiced"
 msgstr ""
 
 #. module: account
-#: help:account.balance.account.balance.report,init,periods:0
+#: help:account.account.balance.report,checktype,periods:0
+#: help:account.general.ledger.report,checktype,periods:0
+#: help:account.partner.balance.report,init,periods:0
+#: help:account.third_party_ledger.report,init,periods:0
+#: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr "Všechna období jsou prázdná"
+msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2204,17 +2285,22 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0
+#: rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0 field:account.move,date:0
+#: rml:account.journal.period.print:0
+#: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
+#: field:account.subscription.line,date:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Date"
 msgstr ""
 
@@ -2230,7 +2316,8 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0 field:account.tax.template,type:0
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr ""
 
@@ -2240,7 +2327,8 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0
+#: field:account.journal,user_id:0
 msgid "User"
 msgstr ""
 
@@ -2326,15 +2414,18 @@ msgid "Date End"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0
+#: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2423,9 +2514,11 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0
+#: wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0
+#: view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2444,7 +2537,8 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr ""
 
@@ -2454,8 +2548,10 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2469,7 +2565,8 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0 wizard_view:account.move.validate,init:0
+#: view:account.move.line:0
+#: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr ""
@@ -2512,6 +2609,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2579,7 +2678,8 @@ msgid "Price"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2614,6 +2714,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr ""
@@ -2646,13 +2747,17 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0 field:account.account.template,name:0
+#: field:account.account,name:0
+#: field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0 field:account.config.wizard,name:0
-#: field:account.model.line,name:0 field:account.move,name:0
-#: field:account.move.line,name:0 field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0
+#: field:account.config.wizard,name:0
+#: field:account.model.line,name:0
+#: field:account.move,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr ""
@@ -2692,7 +2797,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0 view:account.journal.view:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2785,11 +2891,14 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2810,7 +2919,9 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0 view:product.template:0 view:res.partner:0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
 msgid "Accounting"
 msgstr ""
 
@@ -2843,9 +2954,11 @@ msgstr ""
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr "Vyrovnanost(Reconciliation)"
 
@@ -2855,8 +2968,10 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
-#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax,tax_code_id:0
+#: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -2896,12 +3011,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 xsl:account.transfer:0
+#: rml:account.invoice:0
 msgid "Document"
 msgstr ""
 
@@ -2939,7 +3055,8 @@ msgid "Cancel selected invoices"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -2948,6 +3065,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr ""
 
@@ -2962,23 +3081,28 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.tax,base:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,base:0
 msgid "Base"
 msgstr ""
 
@@ -2988,7 +3112,8 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -2998,13 +3123,15 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.move:0
+#: view:account.invoice:0
+#: view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr ""
 
 #. module: account
-#: view:account.model:0 field:account.model,legend:0
+#: view:account.model:0
+#: field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3019,14 +3146,17 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0 rml:account.account.balance:0
+#: view:account.account:0
+#: rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0
+#: field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3047,9 +3177,12 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0 view:account.invoice.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr ""
@@ -3062,7 +3195,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3087,15 +3221,21 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0 rml:account.account.balance:0
-#: field:account.account.template,code:0 field:account.account.type,code:0
+#: field:account.account,code:0
+#: rml:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
-#: rml:account.general.journal:0 field:account.journal,code:0
-#: rml:account.partner.balance:0 field:account.period,code:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0
+#: field:account.fiscalyear,code:0
+#: rml:account.general.journal:0
+#: field:account.journal,code:0
+#: rml:account.partner.balance:0
+#: field:account.period,code:0
 msgid "Code"
 msgstr ""
 
@@ -3105,7 +3245,8 @@ msgid "Financial Management"
 msgstr "Finanční hospodaření"
 
 #. module: account
-#: selection:account.account.type,close_method:0 selection:account.tax,type:0
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3117,6 +3258,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr ""
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr ""
@@ -3132,7 +3274,8 @@ msgid "Additionnal Information"
 msgstr ""
 
 #. module: account
-#: field:account.tax,name:0 field:account.tax.template,name:0
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr ""
@@ -3209,7 +3352,8 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3222,7 +3366,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3259,7 +3404,8 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:wizard.company.setup:0
+#: view:account.invoice:0
+#: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3275,7 +3421,8 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr ""
 
@@ -3300,13 +3447,15 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0 view:account.account.type:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3342,7 +3491,8 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3418,7 +3568,8 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0
+#: view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3455,7 +3606,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr ""
@@ -3474,11 +3624,14 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr ""
@@ -3544,7 +3697,8 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0 rml:account.overdue:0
+#: field:account.move.line,date_maturity:0
+#: rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3564,7 +3718,8 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3602,7 +3757,8 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0 field:account.account.template,note:0
+#: field:account.account,note:0
+#: field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3626,7 +3782,8 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Closed"
 msgstr ""
 
@@ -3747,9 +3904,12 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0 field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0 field:account.journal,active:0
-#: field:account.journal.period,active:0 field:account.payment.term,active:0
+#: field:account.account,active:0
+#: field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr ""
@@ -3801,15 +3961,20 @@ msgid "Secondary Currency"
 msgstr ""
 
 #. module: account
-#: field:account.account,credit:0 rml:account.account.balance:0
+#: field:account.account,credit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.journal.period.print:0
-#: field:account.model.line,credit:0 field:account.move.line,credit:0
-#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3840,7 +4005,8 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -3932,15 +4098,18 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0 view:account.fiscalyear:0
+#: field:account.config.wizard,period:0
+#: view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -3953,7 +4122,8 @@ msgid "Periods"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -3980,7 +4150,8 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4031,10 +4202,12 @@ msgid "Type Controls"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance.landscape:0
-#: rml:account.balance.account.balance:0
+#: field:account.analytic.account,name:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.central.journal:0
 msgid "Account Name"
-msgstr "Název účtu"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,date:0
@@ -4042,10 +4215,9 @@ msgid "Payment date"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.balance.account.balance.report,backtoinit,end:0
-#: wizard_button:account.balance.account.balance.report,zero_years,end:0
+#: wizard_button:account_use_models,create,end:0
 msgid "Ok"
-msgstr "Ok"
+msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
@@ -4124,7 +4296,8 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0 field:account.account.template,type:0
+#: field:account.account,type:0
+#: field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4150,12 +4323,14 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0
+#: field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4176,7 +4351,8 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4194,7 +4370,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4254,12 +4431,14 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0 view:account.period:0
+#: view:account.fiscalyear:0
+#: view:account.period:0
 msgid "States"
 msgstr ""
 
@@ -4295,7 +4474,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
 msgid "Total"
 msgstr ""
 
@@ -4412,9 +4592,11 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0 field:account.journal,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4509,9 +4691,12 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0 field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0
+#: field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4588,7 +4773,8 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4615,7 +4801,8 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4626,7 +4813,8 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4642,7 +4830,8 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 selection:account.bank.statement,state:0
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4657,7 +4846,8 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0 help:account.tax.template,domain:0
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4675,7 +4865,8 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr ""
 
@@ -4685,16 +4876,22 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0 rml:account.account.balance:0
+#: field:account.account,debit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 field:account.model.line,debit:0
-#: field:account.move.line,debit:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.central.journal:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr ""
@@ -4715,6 +4912,7 @@ msgid "Invoice Lines"
 msgstr ""
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr ""
@@ -4756,7 +4954,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4787,7 +4986,8 @@ msgid "Configuration"
 msgstr "Konfigurace"
 
 #. module: account
-#: view:account.analytic.line:0 view:account.invoice:0
+#: view:account.analytic.line:0
+#: view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -4837,12 +5037,14 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0
+#: field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -4877,12 +5079,14 @@ msgid "Maintains Invoice sequences with Fiscal Year"
 msgstr ""
 
 #. module: account
-#: selection:account.balance.account.balance.report,init,account_choice:0
+#: selection:account.account.balance.report,checktype,display_account:0
+#: selection:account.general.ledger.report,checktype,display_account:0
 msgid "With movements"
-msgstr "S pohyby"
+msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0 field:account.tax.template,domain:0
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
 msgid "Domain"
 msgstr ""
 
@@ -4907,7 +5111,9 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -4924,7 +5130,8 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr ""
 
@@ -4975,7 +5182,8 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 field:account.invoice,payment_ids:0
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5021,9 +5229,12 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.move,state:0
-#: selection:account.move.line,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.move,state:0
+#: selection:account.move.line,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr ""
@@ -5050,7 +5261,8 @@ msgid "Are you sure ?"
 msgstr "Jste si jisti?"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5086,16 +5298,20 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5111,7 +5327,8 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.general.journal:0
+#: rml:account.account.balance:0
+#: rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5134,7 +5351,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5168,7 +5386,6 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5178,7 +5395,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0 model:ir.model,name:account.model_account_move
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5189,7 +5407,8 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0 rml:account.account.balance:0
+#: field:account.account,balance:0
+#: rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5197,9 +5416,12 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0 field:account.move.line,balance:0
-#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0 rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: rml:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr ""
@@ -5243,8 +5465,11 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.journal:0 view:account.move:0 view:account.move.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5283,7 +5508,8 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5348,7 +5574,6 @@ msgstr ""
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5376,11 +5601,15 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
-#: field:account.invoice,name:0 field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0
+#: rml:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0 field:account.payment.term,note:0
-#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
+#: rml:account.overdue:0
+#: field:account.payment.term,note:0
+#: field:account.tax.code,info:0
+#: field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5424,7 +5653,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5505,9 +5735,11 @@ msgid "Models Definition"
 msgstr ""
 
 #. module: account
-#: selection:account.balance.account.balance.report,init,compare_pattern:0
+#: model:account.account.type,name:account.account_type_cash_moves
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Cash"
-msgstr "Hotovost"
+msgstr ""
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
@@ -5545,7 +5777,8 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -5592,8 +5825,10 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5627,8 +5862,10 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0 view:account.payment.term:0
-#: field:account.payment.term,name:0 view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5685,7 +5922,8 @@ msgstr "Ano"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid "Check this if the user is allowed to reconcile entries in this account."
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
@@ -5710,7 +5948,8 @@ msgid "Accounting Dashboard"
 msgstr ""
 
 #. module: account
-#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
 msgstr ""
 
@@ -5758,7 +5997,7 @@ msgstr ""
 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr "Všechny účty"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
@@ -5769,7 +6008,7 @@ msgstr ""
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr "Oznámení"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
@@ -5785,12 +6024,12 @@ msgstr ""
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr "Zvolte Období"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr "Procento"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
@@ -5853,17 +6092,17 @@ msgstr ""
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
 msgid "Show Comparision in %"
-msgstr "Zobrazit porovnání v %"
+msgstr ""
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
 msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr "Nastavení výpisu"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
@@ -5873,7 +6112,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr "Zobrazit Účty"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -5929,9 +6168,9 @@ msgstr ""
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid ""
-"You may have selected the compare options with more than 1 year with credit/"
-"debit columns and % option.This can lead contents to be printed out of the "
-"paper.Please try again."
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
 msgstr ""
 
 #. module: account
@@ -5950,12 +6189,12 @@ msgid "Month Range"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_invoice_created
+#: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
@@ -5970,12 +6209,12 @@ msgid "Accounts by type"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_aged_receivable
+#: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_account_receivable
+#: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
 msgstr ""
 
@@ -5985,18 +6224,18 @@ msgid "Range"
 msgstr ""
 
 #. module: account
-#: model:ir.module.module,description:account.module_meta_information
+#: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
 msgstr ""
 
 #. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_receivable_graph
-#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
 msgstr ""
 
@@ -6011,7 +6250,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
 msgstr ""
@@ -6020,3 +6259,11 @@ msgstr ""
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
 msgstr ""
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Varování !"
+
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "Chyba integrity !"
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index c06407ce158..26c27acce8e 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,13 +7,14 @@ 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"
-"PO-Revision-Date: 2010-06-29 22:11+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
+"PO-Revision-Date: 2010-07-26 17:47+0000\n"
+"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
+"tic.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-01 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-07-27 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -55,7 +56,7 @@ msgstr "Activo"
 #. module: account
 #: 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."
+msgstr "Nombre de modelo no válido en la definición de la acción."
 
 #. module: account
 #: help:account.journal,currency:0
@@ -193,8 +194,6 @@ msgstr "Seleccionar línea movimineto"
 #. module: account
 #: rml:account.journal.period.print:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Ref. asiento"
 
@@ -218,7 +217,7 @@ msgstr "Código para calcular (si tipo=código)"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr "Línea del asiento contable"
+msgstr "Apunte"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
@@ -239,7 +238,6 @@ msgstr "Asientos recurrentes"
 #: field:account.move,amount:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
-#: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Importe"
 
@@ -308,7 +306,6 @@ msgstr "Pagos fuera de plazo"
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -348,6 +345,7 @@ msgid "Delta Debit"
 msgstr "Diferencia debe"
 
 #. module: account
+#: model:account.account.type,name:account.account_type_tax
 #: rml:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -362,7 +360,9 @@ msgstr "Trans. debe"
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
@@ -686,8 +686,11 @@ msgstr "Subtotal :"
 #. module: account
 #: field:account.analytic.account,line_ids:0
 #: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Asientos analíticos"
 
@@ -702,6 +705,7 @@ msgid "Associated Partner"
 msgstr "Empresa asociada"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Información adicional"
@@ -1018,7 +1022,7 @@ msgstr "Contabilidad financiera"
 #. module: account
 #: rml:account.invoice:0
 msgid "Net Total:"
-msgstr "Total neto:"
+msgstr "Base:"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1486,6 +1490,9 @@ msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr "Desajuste"
 
@@ -1896,7 +1903,6 @@ msgstr "x Diario facturas rectificativas (abono) de gastos"
 #: field:account.journal,type:0
 #: field:account.move,type:0
 #: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -2094,7 +2100,7 @@ msgstr "Gasto"
 #. module: account
 #: field:account.journal,invoice_sequence_id:0
 msgid "Invoice Sequence"
-msgstr "factura de secuencia"
+msgstr "Secuencia de facturas"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
@@ -2109,7 +2115,7 @@ msgstr "Proceso de factura de cliente"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr "Comentario situacion fiscal"
+msgstr "Observación posición fiscal :"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2340,13 +2346,13 @@ msgstr "La cuenta base de la declaración de impuestos."
 #: selection:account.general.ledger.report,checktype,sortbydate:0
 #: rml:account.journal.period.print:0
 #: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
 #: field:account.subscription.line,date:0
 #: rml:account.tax.code.entries:0
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
 msgid "Date"
 msgstr "Fecha"
 
@@ -2467,10 +2473,11 @@ msgstr "Fecha final"
 #: view:account.bank.statement:0
 #: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
-msgstr "Líneas de asiento"
+msgstr "Apuntes"
 
 #. module: account
 #: view:account.tax:0
@@ -2660,6 +2667,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2768,6 +2777,7 @@ msgid "Invoice Number"
 msgstr "Número factura"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr "Fin de período"
@@ -2780,7 +2790,7 @@ msgstr "_Aceptar"
 #. module: account
 #: field:account.invoice,amount_untaxed:0
 msgid "Untaxed"
-msgstr "Sin impuestos"
+msgstr "Base"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
@@ -2954,8 +2964,6 @@ msgstr "Nombre completo de la cuenta"
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
@@ -3005,16 +3013,18 @@ msgstr "Conciliación de asientos de órdenes de pago."
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
 #: model:ir.model,name:account.model_account_move_line
 msgid "Entry lines"
-msgstr "Líneas de asiento"
+msgstr "Apuntes"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr "Conciliación"
 
@@ -3077,7 +3087,6 @@ msgstr "Situación"
 
 #. module: account
 #: rml:account.invoice:0
-#: xsl:account.transfer:0
 msgid "Document"
 msgstr "Documento"
 
@@ -3127,6 +3136,8 @@ msgstr "Diario analítico"
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr "Etiqueta asiento"
 
@@ -3319,6 +3330,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr "Generar asientos apertura ejercicio fiscal"
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr "Conciliar los asientos"
@@ -3676,7 +3688,6 @@ msgstr ""
 "empresa actual."
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr "Descripción"
@@ -4146,8 +4157,8 @@ msgid ""
 "You can check this box to mark the entry line as a litigation with the "
 "associated partner"
 msgstr ""
-"Marque esta opción para señalar la línea de asiento en desacuerdo con la "
-"empresa asociada"
+"Marque esta opción para señalar el apunte en desacuerdo con la empresa "
+"asociada"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -4285,7 +4296,7 @@ msgid ""
 "date for the payment of this entry line."
 msgstr ""
 "Este campo es usado en asientos a pagar y a cobrar. Puede definir la fecha "
-"límite de pago para esta línea de asiento."
+"límite de pago para este apunte."
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -5031,6 +5042,7 @@ msgid "Invoice Lines"
 msgstr "Líneas de factura"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr "Inicio del periodo"
@@ -5391,7 +5403,7 @@ msgstr "PRO-FORMA"
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr "Líneas de asiento parcial"
+msgstr "Apuntes de conciliación parcial"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5427,8 +5439,6 @@ msgstr "Proceso factura de proveedor"
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Página"
@@ -5514,7 +5524,6 @@ msgstr "Número de periodos"
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5708,7 +5717,6 @@ msgstr "Ejercicio fiscal a cerrar"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -6258,7 +6266,7 @@ msgid "Show Comparision in %"
 msgstr "Mostrar comparación en %"
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
 msgstr "Seleccionar periodo"
 
@@ -6435,5 +6443,324 @@ msgstr "A cobrar anteriores"
 msgid "Untaxed Amount"
 msgstr "Base imponible"
 
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "¡Error de integridad!"
+
+#, python-format
+#~ msgid "You have to provide an account for the write off entry !"
+#~ msgstr "¡Debe indicar una cuenta para el asiento de ajuste!"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "¡Atención!"
+
+#, python-format
+#~ msgid "You can not delete posted movement: \"%s\"!"
+#~ msgstr "¡No puede eliminar el movimiento fijado: \"%s\"!"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "¡No diario analítico!"
+
+#, python-format
+#~ msgid "Bank Journal "
+#~ msgstr "Diario bancario "
+
+#, python-format
+#~ msgid "You can not use this general account in this journal !"
+#~ msgstr "¡No puede usar esta cuenta general en este diario!"
+
+#, python-format
+#~ msgid "You can not add/modify entries in a closed journal."
+#~ msgstr "No puede añadir/modificar asientos en un diario cerrado."
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a reconciled entry ! Please note that "
+#~ "you can just change some non important fields !"
+#~ msgstr ""
+#~ "¡No puede hacer esta modificación en un asiento conciliado! ¡Observe que "
+#~ "sólo puede cambiar algunos campos no importantes!"
+
+#, python-format
+#~ msgid "You must first select a partner !"
+#~ msgstr "¡Primero debe seleccionar una empresa!"
+
+#, python-format
+#~ msgid "The opening journal must not have any entry in the new fiscal year !"
+#~ msgstr ""
+#~ "¡El diario de apertura no debe tener ningún asiento en el nuevo ejercicio "
+#~ "fiscal!"
+
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.asistente"
+
+#, python-format
+#~ msgid ""
+#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
+#~ msgstr "El balance previsto (%.2f) es diferente del calculado. (%.2f)"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a confirmed entry ! Please note that you "
+#~ "can just change some non important fields !"
+#~ msgstr ""
+#~ "¡No puede hacer esta modificación en un asiento confirmado! ¡Observe que "
+#~ "sólo puede cambiar algunos campos no importantes!"
+
+#, python-format
+#~ msgid "Purchase Journal"
+#~ msgstr "Diario de compras"
+
+#, python-format
+#~ msgid "Free Reference"
+#~ msgstr "Referencia libre"
+
+#, python-format
+#~ msgid "No Partner Defined !"
+#~ msgstr "¡No se ha definido empresa!"
+
+#, python-format
+#~ msgid "Entries are not of the same account or already reconciled ! "
+#~ msgstr "¡Asientos no son de la misma cuenta o ya están conciliados! "
+
+#, python-format
+#~ msgid "Invalid action !"
+#~ msgstr "¡Acción no válida!"
+
+#, python-format
+#~ msgid "No sequence defined in the journal !"
+#~ msgstr "¡No se ha definido una secuencia en el diario!"
+
+#, python-format
+#~ msgid "Your journal must have a default credit and debit account."
+#~ msgstr "El diario debe tener una cuenta haber y debe por defecto."
+
+#, python-format
+#~ msgid "The journal must have default credit and debit account"
+#~ msgstr "El diario debe tener una cuenta haber y debe por defecto."
+
+#, python-format
+#~ msgid "Some entries are already reconciled !"
+#~ msgstr "¡Algunos asientos ya están conciliados!"
+
+#, python-format
+#~ msgid "No Analytic Journal !"
+#~ msgstr "¡No diario analítico!"
+
+#, python-format
+#~ msgid "Already Reconciled"
+#~ msgstr "Ya conciliado"
+
+#, python-format
+#~ msgid "The account entries lines are not in valid state."
+#~ msgstr "Las líneas de los asientos contables no están en estado válido."
+
+#, python-format
+#~ msgid "Unable to reconcile entry \"%s\": %.2f"
+#~ msgstr "No es posible conciliar el asiento \"%s\": %.2f"
+
+#, python-format
+#~ msgid "Please set an analytic journal on this financial journal !"
+#~ msgstr "¡Por favor indique un diario analítico en este diario financiero!"
+
+#, python-format
+#~ msgid "EXJ"
+#~ msgstr "GASTO"
+
+#, python-format
+#~ msgid "Sales Journal"
+#~ msgstr "Diario de ventas"
+
+#, python-format
+#~ msgid "BNK"
+#~ msgstr "BANCO"
+
+#, python-format
+#~ msgid "Entries: "
+#~ msgstr "Asientos: "
+
+#, python-format
+#~ msgid "Couldn't create move between different companies"
+#~ msgstr "No se ha podido crear movimiento entre diferentes compañías"
+
+#, python-format
+#~ msgid "Entry \"%s\" is not valid !"
+#~ msgstr "¡El asiento \"%s\" no es válido!"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
+#, python-format
+#~ msgid "SAJ"
+#~ msgstr "VENTA"
+
+#, python-format
+#~ msgid "The journal must have centralised counterpart"
+#~ msgstr "El diario debe tener un homólogo centralizado"
+
+#, python-format
+#~ msgid "Bad total !"
+#~ msgstr "¡Total erróneo!"
+
+#, python-format
+#~ msgid "End of Fiscal Year Entry"
+#~ msgstr "Asiento fin de ejercicio fiscal"
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "Error de usuario"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Aviso"
+
+#, python-format
+#~ msgid "Please verify that an account is defined in the journal."
+#~ msgstr "Compruebe que se ha definido una cuenta en el diario."
+
+#, python-format
+#~ msgid "You can not use an inactive account!"
+#~ msgstr "¡No puede utilizar una cuenta inactiva!"
+
+#, python-format
+#~ msgid "Entry is already reconciled"
+#~ msgstr "El asiento ya está conciliado"
+
+#, python-format
+#~ msgid ""
+#~ "Selected Move lines does not have any account move enties in draft state"
+#~ msgstr ""
+#~ "Ha seleccionado apuntes que no tienen ningún asiento contable en estado "
+#~ "borrador"
+
+#, python-format
+#~ msgid "Standard Encoding"
+#~ msgstr "Codificación estándar"
+
+#, python-format
+#~ msgid "Bad account!"
+#~ msgstr "¡Cuenta incorrecta!"
+
+#, python-format
+#~ msgid "Closing of fiscal year cancelled, please check the box !"
+#~ msgstr "¡Cierre del ejercicio fiscal cancelado, por favor marque la caja!"
+
+#, python-format
+#~ msgid "Bad account !"
+#~ msgstr "¡Cuenta incorrecta!"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#, python-format
+#~ msgid "Taxes missing !"
+#~ msgstr "¡Faltan impuestos!"
+
+#, python-format
+#~ msgid "No piece number !"
+#~ msgstr "¡Ningún trozo de número!"
+
+#, python-format
+#~ msgid "Closing of states cancelled, please check the box !"
+#~ msgstr "¡Cierre de estados cancelado, por favor marque la caja!"
+
+#, python-format
+#~ msgid "You have to define an analytic journal on the '%s' journal!"
+#~ msgstr "¡Debe definir un diario analítico en el diario '%s'!"
+
+#, python-format
+#~ msgid "No Data Available"
+#~ msgstr "No hay datos disponibles"
+
+#, python-format
+#~ msgid "You must select accounts to reconcile"
+#~ msgstr "Debe seleccionar las cuentas a conciliar"
+
+#, python-format
+#~ msgid "Cannot delete invoice(s) that are already opened or paid !"
+#~ msgstr "¡No se puede eliminar factura(s) que ya estan abiertas o pagadas!"
+
+#, python-format
+#~ msgid "Unable to change tax !"
+#~ msgstr "¡No ha sido posible cambiar el impuesto!"
+
+#, python-format
+#~ msgid "Invoice is already reconciled"
+#~ msgstr "La factura ya está conciliada"
+
+#, python-format
+#~ msgid "Date to must be set between %s and %s"
+#~ msgstr "La fecha debe estar entre %s y %s"
+
+#, python-format
+#~ msgid "No records found for your selection!"
+#~ msgstr "¡No se han encontrado registros en su selección!"
+
+#, python-format
+#~ msgid "Data Insufficient !"
+#~ msgstr "¡Datos insuficientes!"
+
+#, python-format
+#~ msgid "Date not in a defined fiscal year"
+#~ msgstr "La fecha no está en un ejercicio fiscal definido"
+
+#, python-format
+#~ msgid "Can not pay draft/proforma/cancel invoice."
+#~ msgstr "No se puede pagar una factura borrador/proforma/cancelada."
+
+#, python-format
+#~ msgid "You must define an analytic journal of type '%s' !"
+#~ msgstr "¡Debe definir un diario analítico de tipo '%s'!"
+
+#, python-format
+#~ msgid "No journal for ending writing has been defined for the fiscal year"
+#~ msgstr ""
+#~ "No se ha definido un diario para el asiento de cierre para el ejercicio "
+#~ "fiscal"
+
+#, python-format
+#~ msgid "Can not %s draft/proforma/cancel invoice."
+#~ msgstr "No se puede %s factura borrador/proforma/cancelada."
+
+#, python-format
+#~ msgid "Cannot create invoice move on centralised journal"
+#~ msgstr "No se puede crear asiento factura en el diario centralizado"
+
+#, python-format
+#~ msgid ""
+#~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+#~ "defined !"
+#~ msgstr ""
+#~ "¡El plazo de pago de los proveedores no tiene líneas de plazo de pago "
+#~ "(Cálculo) definidas!"
+
+#, python-format
+#~ msgid "You can not change the tax, you should remove and recreate lines !"
+#~ msgstr ""
+#~ "¡No se puede cambiar el impuesto, debe eliminar y recrear las líneas!"
+
+#, python-format
+#~ msgid "Global taxes defined, but are not in invoice lines !"
+#~ msgstr ""
+#~ "¡Impuestos globales definidos, pero no están en líneas de la factura!"
+
+#, python-format
+#~ msgid "No Period found on Invoice!"
+#~ msgstr "No se encontro un período en la factura"
+
+#, python-format
+#~ msgid "No period found !"
+#~ msgstr "¡No se ha encontrado período!"
+
+#, python-format
+#~ msgid "Unable to find a valid period !"
+#~ msgstr "¡No ha sido posible encontrar un período válido!"
+
+#, python-format
+#~ msgid "You must enter a period length that cannot be 0 or below !"
+#~ msgstr ""
+#~ "¡Debe introducir una duración del período que no puede ser 0 o inferior!"
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index 015b3382131..455b6da50ce 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* account
+#	* account
 #
 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"
-"PO-Revision-Date: 2010-06-25 18:22+0000\n"
+"PO-Revision-Date: 2010-07-29 06:54+0000\n"
 "Last-Translator: lyyser <logard.1961@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-06-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-07-30 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -92,7 +92,8 @@ msgid "Unreconciled entries"
 msgstr "Võrdlemata kirjed"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Baaskood"
@@ -124,7 +125,8 @@ msgid "Residual"
 msgstr "Jääk"
 
 #. module: account
-#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -185,8 +187,8 @@ msgid "Move line select"
 msgstr "Liiguta valitud rida"
 
 #. module: account
-#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0
+#: rml:account.tax.code.entries:0
 msgid "Entry label"
 msgstr "Kirje silt"
 
@@ -201,12 +203,14 @@ msgid "Period Sum"
 msgstr "Perioodi summa"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Arvuta kood (kui tüüp=kood)"
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Raamatupidamiskande rida"
 
@@ -223,10 +227,12 @@ msgstr "Perioodilised kirjed"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
-#: field:account.invoice.tax,amount:0 field:account.move,amount:0
-#: field:account.tax,amount:0 field:account.tax.template,amount:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.reconcile.line,amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: field:account.move,amount:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
 msgid "Amount"
 msgstr "Kogus"
 
@@ -262,7 +268,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -271,19 +278,20 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0 selection:account.tax.template,type:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fikseeritud"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
 msgid "Overdue Payments"
 msgstr "Tasumata Maksed"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -292,7 +300,8 @@ msgid "Select period"
 msgstr "Vali periood"
 
 #. module: account
-#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Päritolu"
 
@@ -322,10 +331,12 @@ msgid "Delta Debit"
 msgstr "Delta deebet"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice,amount_tax:0
+#: model:account.account.type,name:account.account_type_tax
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "Maksud"
+msgstr "Maks"
 
 #. module: account
 #: rml:account.general.journal:0
@@ -335,18 +346,22 @@ msgstr "Deebet tehing"
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Analüütiline konto"
 
 #. module: account
-#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Maks alamliikidele"
 
 #. module: account
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Päeviku nimi"
@@ -414,8 +429,11 @@ msgid "Contra"
 msgstr "Vastu"
 
 #. module: account
-#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
-#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
+#: field:account.analytic.account,state:0
+#: field:account.bank.statement,state:0
+#: field:account.invoice,state:0
+#: view:account.move:0
+#: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Olek"
@@ -427,7 +445,8 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Maksmata tarnija hüvitised"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Eriline arvutamine"
 
@@ -449,8 +468,10 @@ msgid "Disc.(%)"
 msgstr "Allah. (%)"
 
 #. module: account
-#: rml:account.general.ledger:0 field:account.model,ref:0
-#: field:account.move,ref:0 rml:account.overdue:0
+#: rml:account.general.ledger:0
+#: field:account.model,ref:0
+#: field:account.move,ref:0
+#: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Viide"
@@ -641,9 +662,13 @@ msgid "Sub-Total :"
 msgstr "Vahesumma:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0
+#: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Analüütilised kirjed"
 
@@ -658,6 +683,7 @@ msgid "Associated Partner"
 msgstr "Seotud partner"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Lisainfo"
@@ -673,7 +699,8 @@ msgid "Select the Period for Analysis"
 msgstr "Vali periood analüüsi jaoks"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -705,7 +732,8 @@ msgid "Field Name"
 msgstr "Välja nimi"
 
 #. module: account
-#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0
+#: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Logi vanemana"
 
@@ -715,7 +743,8 @@ msgid "End of Year Entries Journal"
 msgstr "Aastalõpu kirjete päevik"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Purchase Properties"
 msgstr "Ostu omadused"
 
@@ -735,9 +764,12 @@ msgid "Move Lines Created."
 msgstr "Liiguta loodud read."
 
 #. module: account
-#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
-#: field:account.move,state:0 field:account.move.line,state:0
-#: field:account.period,state:0 field:account.subscription,state:0
+#: field:account.fiscalyear,state:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: field:account.subscription,state:0
 msgid "Status"
 msgstr "Olek"
 
@@ -890,8 +922,10 @@ msgstr "Vali kontoplaan"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
-#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Kogus"
@@ -934,13 +968,16 @@ msgstr "Analüütiline arve"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0 rml:account.general.journal:0
+#: view:account.fiscalyear:0
+#: rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0 field:account.move,period_id:0
+#: field:account.journal.period,period_id:0
+#: field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0
+#: view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -962,7 +999,8 @@ msgid "Net Total:"
 msgstr "Netosumma:"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1084,7 +1122,8 @@ msgid "Fiscal Position Templates"
 msgstr "Finantspositsioonide mallid"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Ühiku hind"
 
@@ -1237,7 +1276,8 @@ msgid "Not reconciled transactions"
 msgstr "Võrdlemata tehingud"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1259,7 +1299,8 @@ msgid "Write-Off account"
 msgstr "Mahakandmiste konto"
 
 #. module: account
-#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0
+#: field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Mudel"
 
@@ -1285,9 +1326,11 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0
+#: field:account.journal,view_id:0
 msgid "View"
 msgstr "Vaade"
 
@@ -1356,7 +1399,8 @@ msgstr "Konto tüübid"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1372,7 +1416,8 @@ msgid "Journal"
 msgstr "Päevik"
 
 #. module: account
-#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0
+#: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Alamkontod"
 
@@ -1398,7 +1443,8 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Hoia tühjana, et kasutada tulude kontot"
 
@@ -1407,6 +1453,9 @@ msgstr "Hoia tühjana, et kasutada tulude kontot"
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr "Mahakandmine"
 
@@ -1525,7 +1574,8 @@ msgid "Account n°"
 msgstr "Konto nr."
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Jäta tühjaks kasutamaks kulu kontot"
 
@@ -1535,7 +1585,8 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 field:account.model.line,partner_id:0
+#: rml:account.invoice:0
+#: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Partneri viide"
@@ -1547,12 +1598,14 @@ msgid "Receivable and Payable Accounts"
 msgstr "Nõuete ja võlgade kontod"
 
 #. module: account
-#: view:account.subscription:0 field:account.subscription,lines_id:0
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Tellimuse read"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1716,7 +1769,8 @@ msgid "Period length (days)"
 msgstr "Perioodi pikkus (päeva)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Protsent"
@@ -1727,7 +1781,8 @@ msgid "Charts"
 msgstr "Plaanid"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1801,9 +1856,11 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
-#: field:account.journal,type:0 field:account.move,type:0
-#: field:account.move.reconcile,type:0 xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: field:account.journal,type:0
+#: field:account.move,type:0
+#: field:account.move.reconcile,type:0
 msgid "Type"
 msgstr "Tüüp"
 
@@ -1951,7 +2008,8 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -1966,7 +2024,8 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2039,8 +2098,10 @@ msgstr "Endine"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
-#: field:account.journal,currency:0 field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.journal,currency:0
+#: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Valuuta"
@@ -2078,7 +2139,8 @@ msgid "Analytic Entry"
 msgstr "Analüütiline kirje"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2130,7 +2192,8 @@ msgid "Detail"
 msgstr "Detail"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Konsolideerimine"
 
@@ -2193,9 +2256,13 @@ msgid "Date Invoiced"
 msgstr "Arveldamise kuupäev"
 
 #. module: account
-#: help:account.balance.account.balance.report,init,periods:0
+#: help:account.account.balance.report,checktype,periods:0
+#: help:account.general.ledger.report,checktype,periods:0
+#: help:account.partner.balance.report,init,periods:0
+#: help:account.third_party_ledger.report,init,periods:0
+#: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr "Kõik perioodid kui tühi"
+msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2218,17 +2285,22 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0
+#: rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0 field:account.move,date:0
+#: rml:account.journal.period.print:0
+#: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
+#: field:account.subscription.line,date:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -2244,7 +2316,8 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0 field:account.tax.template,type:0
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Maksutüüp"
 
@@ -2254,7 +2327,8 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0
+#: field:account.journal,user_id:0
 msgid "User"
 msgstr "Kasutaja"
 
@@ -2340,15 +2414,18 @@ msgid "Date End"
 msgstr "Lõppkuupäev"
 
 #. module: account
-#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0
+#: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
 msgstr "Kirje read"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2437,9 +2514,11 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0
+#: wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0
+#: view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2458,7 +2537,8 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Loobu"
 
@@ -2468,8 +2548,10 @@ msgid "Acc. Type Name"
 msgstr "Konto tüübi nimi"
 
 #. module: account
-#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2483,7 +2565,8 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0 wizard_view:account.move.validate,init:0
+#: view:account.move.line:0
+#: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Info"
@@ -2526,6 +2609,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2593,7 +2678,8 @@ msgid "Price"
 msgstr "Hind"
 
 #. module: account
-#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2628,6 +2714,7 @@ msgid "Invoice Number"
 msgstr "Arve number"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr "Perioodi lõpp"
@@ -2660,13 +2747,17 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0 field:account.account.template,name:0
+#: field:account.account,name:0
+#: field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0 field:account.config.wizard,name:0
-#: field:account.model.line,name:0 field:account.move,name:0
-#: field:account.move.line,name:0 field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0
+#: field:account.config.wizard,name:0
+#: field:account.model.line,name:0
+#: field:account.move,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nimi"
@@ -2706,7 +2797,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0 view:account.journal.view:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2799,11 +2891,14 @@ msgid "Full Account Name"
 msgstr "Täielik konto nimi"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2824,7 +2919,9 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0 view:product.template:0 view:res.partner:0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
 msgid "Accounting"
 msgstr "Raamatupidamine"
 
@@ -2857,9 +2954,11 @@ msgstr "Kirje read"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr ""
 
@@ -2869,8 +2968,10 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
-#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax,tax_code_id:0
+#: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Maksukood"
@@ -2910,12 +3011,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 xsl:account.transfer:0
+#: rml:account.invoice:0
 msgid "Document"
 msgstr "Dokument"
 
@@ -2953,7 +3055,8 @@ msgid "Cancel selected invoices"
 msgstr "Tühista valitud arved"
 
 #. module: account
-#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -2962,6 +3065,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr ""
 
@@ -2976,23 +3081,28 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Sea mustandiks"
 
 #. module: account
-#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Võlad"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.tax,base:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Baas"
 
@@ -3002,7 +3112,8 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Others"
 msgstr "Muud"
 
@@ -3012,13 +3123,15 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.move:0
+#: view:account.invoice:0
+#: view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Valideeri"
 
 #. module: account
-#: view:account.model:0 field:account.model,legend:0
+#: view:account.model:0
+#: field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3033,14 +3146,17 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0 rml:account.account.balance:0
+#: view:account.account:0
+#: rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0
+#: field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3061,9 +3177,12 @@ msgid "By Date and Period"
 msgstr "Kuupäeva ja perioodi järgi"
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0 view:account.invoice.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Märkused"
@@ -3076,7 +3195,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3101,15 +3221,21 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0 rml:account.account.balance:0
-#: field:account.account.template,code:0 field:account.account.type,code:0
+#: field:account.account,code:0
+#: rml:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
-#: rml:account.general.journal:0 field:account.journal,code:0
-#: rml:account.partner.balance:0 field:account.period,code:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0
+#: field:account.fiscalyear,code:0
+#: rml:account.general.journal:0
+#: field:account.journal,code:0
+#: rml:account.partner.balance:0
+#: field:account.period,code:0
 msgid "Code"
 msgstr "Kood"
 
@@ -3119,7 +3245,8 @@ msgid "Financial Management"
 msgstr "Finantshaldus"
 
 #. module: account
-#: selection:account.account.type,close_method:0 selection:account.tax,type:0
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3131,6 +3258,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr "Genereeri majandusaasta avatud kirjetega"
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr ""
@@ -3146,7 +3274,8 @@ msgid "Additionnal Information"
 msgstr "Lisainfo"
 
 #. module: account
-#: field:account.tax,name:0 field:account.tax.template,name:0
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Maksu Nimi"
@@ -3223,7 +3352,8 @@ msgid "Partner Balance"
 msgstr "Partneri bilanss"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3236,7 +3366,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3273,7 +3404,8 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:wizard.company.setup:0
+#: view:account.invoice:0
+#: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3289,7 +3421,8 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Otsetee"
 
@@ -3314,13 +3447,15 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Ülem maksukonto"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0 view:account.account.type:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3356,7 +3491,8 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3432,7 +3568,8 @@ msgid "Journal code"
 msgstr "Päeviku kood"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0
+#: view:account.model:0
 msgid "Create entries"
 msgstr "Loo sissekanded"
 
@@ -3469,7 +3606,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr "Kirje Nimi"
@@ -3488,11 +3624,14 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Järjekord"
@@ -3558,7 +3697,8 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0 rml:account.overdue:0
+#: field:account.move.line,date_maturity:0
+#: rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Tähtaja kuupäev"
 
@@ -3578,7 +3718,8 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Alguskuupäev"
@@ -3616,7 +3757,8 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0 field:account.account.template,note:0
+#: field:account.account,note:0
+#: field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3640,7 +3782,8 @@ msgid "Entry Sequence"
 msgstr "Kirje järjekord"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Suletud"
 
@@ -3761,9 +3904,12 @@ msgid "Code/Date"
 msgstr "Kood/Kuupäev"
 
 #. module: account
-#: field:account.account,active:0 field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0 field:account.journal,active:0
-#: field:account.journal.period,active:0 field:account.payment.term,active:0
+#: field:account.account,active:0
+#: field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktiivne"
@@ -3815,15 +3961,20 @@ msgid "Secondary Currency"
 msgstr "Teine Valuuta"
 
 #. module: account
-#: field:account.account,credit:0 rml:account.account.balance:0
+#: field:account.account,credit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.journal.period.print:0
-#: field:account.model.line,credit:0 field:account.move.line,credit:0
-#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3854,7 +4005,8 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -3946,15 +4098,18 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Valmis"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0 view:account.fiscalyear:0
+#: field:account.config.wizard,period:0
+#: view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -3967,7 +4122,8 @@ msgid "Periods"
 msgstr "Perioodid"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -3994,7 +4150,8 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Vaikimisi Maksud"
 
@@ -4048,7 +4205,8 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Konto nimi"
 
@@ -4139,7 +4297,8 @@ msgid "Import file from your bank statement"
 msgstr "Impordi fail oma pangabilansist"
 
 #. module: account
-#: field:account.account,type:0 field:account.account.template,type:0
+#: field:account.account,type:0
+#: field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Sisemine tüüp"
 
@@ -4165,12 +4324,14 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Krediidi Märkused"
 
 #. module: account
-#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0
+#: field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Lõppkuupäev"
 
@@ -4191,7 +4352,8 @@ msgid "Day of the Month"
 msgstr "Päev kuus"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Read"
 
@@ -4209,7 +4371,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Maksudeklaratsioon"
 
@@ -4269,12 +4432,14 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0 view:account.period:0
+#: view:account.fiscalyear:0
+#: view:account.period:0
 msgid "States"
 msgstr "Olekud"
 
@@ -4288,7 +4453,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
 msgid "Receivables & Payables"
-msgstr "Nõuded ja võlad"
+msgstr ""
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -4310,7 +4475,8 @@ msgstr "Alguskuupäev"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Kokku"
 
@@ -4427,9 +4593,11 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0 field:account.journal,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4524,9 +4692,12 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0 field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0
+#: field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4603,7 +4774,8 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Nõuded"
@@ -4630,7 +4802,8 @@ msgstr "KM:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Kokku:"
@@ -4641,7 +4814,8 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4657,7 +4831,8 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 selection:account.bank.statement,state:0
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Kinnita"
 
@@ -4672,7 +4847,8 @@ msgid "Parent Account Template"
 msgstr "Ülemkonto mall"
 
 #. module: account
-#: help:account.tax,domain:0 help:account.tax.template,domain:0
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4690,7 +4866,8 @@ msgid "Analytic account"
 msgstr "Analüütiline konto"
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Tarnija arve"
 
@@ -4700,16 +4877,22 @@ msgid "Valid"
 msgstr "Kehtiv"
 
 #. module: account
-#: field:account.account,debit:0 rml:account.account.balance:0
+#: field:account.account,debit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 field:account.model.line,debit:0
-#: field:account.move.line,debit:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.central.journal:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Deebet"
@@ -4730,6 +4913,7 @@ msgid "Invoice Lines"
 msgstr "Arve read"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr "Perioodi algus"
@@ -4771,7 +4955,8 @@ msgid "Reporting"
 msgstr "Aruandlus"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -4799,10 +4984,11 @@ msgstr "Grupeeri arve read"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
 msgid "Configuration"
-msgstr "Seadistus"
+msgstr "Seadistused"
 
 #. module: account
-#: view:account.analytic.line:0 view:account.invoice:0
+#: view:account.analytic.line:0
+#: view:account.invoice:0
 msgid "Total amount"
 msgstr "Kogusumma"
 
@@ -4852,12 +5038,14 @@ msgid "Paid invoice"
 msgstr "Makstud arve"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Maksu definitsioon"
 
 #. module: account
-#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0
+#: field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Maksu Grupp"
 
@@ -4898,7 +5086,8 @@ msgid "With movements"
 msgstr "Liikumistega"
 
 #. module: account
-#: field:account.tax,domain:0 field:account.tax.template,domain:0
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domeen"
 
@@ -4923,7 +5112,9 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -4940,7 +5131,8 @@ msgid "Payable Accounts"
 msgstr "Võlgade kontod"
 
 #. module: account
-#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Arve rida"
 
@@ -4991,7 +5183,8 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 field:account.invoice,payment_ids:0
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Maksed"
@@ -5037,9 +5230,12 @@ msgstr "Vali päevik ja makse kuupäev"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.move,state:0
-#: selection:account.move.line,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.move,state:0
+#: selection:account.move.line,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Mustand"
@@ -5066,7 +5262,8 @@ msgid "Are you sure ?"
 msgstr "Oled sa kindel?"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -5102,16 +5299,20 @@ msgid "Supplier Invoice Process"
 msgstr "Tarnija arve protsess"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Optional Information"
 msgstr "Valikuline info"
 
@@ -5127,7 +5328,8 @@ msgid "Receivable and Payable"
 msgstr "Nõuded ja võlad"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.general.journal:0
+#: rml:account.account.balance:0
+#: rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5150,7 +5352,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Arvuta"
@@ -5184,7 +5387,6 @@ msgstr "Perioodide arv"
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5194,7 +5396,8 @@ msgid "End of period"
 msgstr "Perioodi lõpp"
 
 #. module: account
-#: view:account.move:0 model:ir.model,name:account.model_account_move
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Konto kirje"
 
@@ -5205,7 +5408,8 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0 rml:account.account.balance:0
+#: field:account.account,balance:0
+#: rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5213,9 +5417,12 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0 field:account.move.line,balance:0
-#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0 rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: rml:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Bilanss"
@@ -5259,8 +5466,11 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.journal:0 view:account.move:0 view:account.move.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "General Information"
 msgstr "Üldine info"
 
@@ -5299,7 +5509,8 @@ msgid "List of Accounts"
 msgstr "Kontode nimekiri"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5364,7 +5575,6 @@ msgstr "Majandusaasta mida sulgeda"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5392,11 +5602,15 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
-#: field:account.invoice,name:0 field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0
+#: rml:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0 field:account.payment.term,note:0
-#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
+#: rml:account.overdue:0
+#: field:account.payment.term,note:0
+#: field:account.tax.code,info:0
+#: field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Kirjeldus"
 
@@ -5440,7 +5654,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5522,7 +5737,8 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Cash"
 msgstr "Kassa"
 
@@ -5562,7 +5778,8 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Jäta tühjaks kõigi avatud majandusaastate joks"
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Tarnija tagasimakse"
 
@@ -5610,8 +5827,10 @@ msgstr ""
 "Seda kontot kasutatakse käesoleva kategooria lao väljundväärtuse hindamiseks"
 
 #. module: account
-#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5645,8 +5864,10 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Majandusaasta nimi nagu kuvatakse ekraanil."
 
 #. module: account
-#: field:account.invoice,payment_term:0 view:account.payment.term:0
-#: field:account.payment.term,name:0 view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5704,7 +5925,8 @@ msgstr "Jah"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid "Check this if the user is allowed to reconcile entries in this account."
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
@@ -5715,21 +5937,22 @@ msgstr "Arvuta kirje kuupäevad"
 #. module: account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr "Analüütilised kontod sulgeda"
+msgstr ""
 
 #. module: account
 #: view:board.board:0
 msgid "Draft invoices"
-msgstr "Arvete mustandid"
+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 "Raamatupdamise töölaud"
+msgstr ""
 
 #. module: account
-#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
 msgstr ""
 
@@ -5737,7 +5960,7 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr "Kulud arveldamiseks"
+msgstr ""
 
 #. module: account
 #: view:board.board:0
@@ -5747,69 +5970,69 @@ msgstr ""
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Board for accountant"
-msgstr "Töölaud raamatupidajale"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr "Tulude kontod"
+msgstr ""
 
 #. module: account
 #: view:board.board:0
 msgid "My indicators"
-msgstr "Minu näiturid"
+msgstr ""
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr "Raamatupidamise töölaud"
+msgstr ""
 
 #. module: account
 #: view:board.board:0
 msgid "Aged income"
-msgstr "Aegunud tulu"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
 msgid "Show Debit/Credit Information"
-msgstr "Näita Deebet/Kreedit informatsiooni"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr "Kõik kontod"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
 msgid "Entries Selection Based on"
-msgstr "Kirjete valik põhineb"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr "Teavitus"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr "Finantsperiood"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr "Kontojääk"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr "Vali periood(id)"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr "Protsent"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
@@ -5867,7 +6090,7 @@ msgstr ""
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Kokku :"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
@@ -5875,7 +6098,7 @@ msgid "Show Comparision in %"
 msgstr "Näita võrdlus protsentides %"
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
 msgstr "Vali periood"
 
@@ -5887,17 +6110,17 @@ msgstr "Aruande valikud"
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr "Ära Võrdle"
+msgstr "Ära võrdle"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr "Näita Kontosid"
+msgstr "Näita kontosid"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "1. You have selected more than 3 years in any case."
-msgstr ""
+msgstr "1. Teie valisite rohkem kui kolm aastat igal juhul"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -5908,7 +6131,7 @@ msgstr ""
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Aasta :"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -5933,12 +6156,12 @@ msgstr ""
 #. module: account
 #: help:account.balance.account.balance.report,init,select_account:0
 msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "Jätke tühjaks, et võrrelda selle vanemaga"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr "Loomise Kuupäev"
+msgstr "Loomise kuupäev"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -5950,9 +6173,9 @@ msgstr ""
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid ""
-"You may have selected the compare options with more than 1 year with credit/"
-"debit columns and % option.This can lead contents to be printed out of the "
-"paper.Please try again."
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
 msgstr ""
 
 #. module: account
@@ -5971,12 +6194,12 @@ msgid "Month Range"
 msgstr "Kuu vahemik"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
 msgstr "Viimase 15 päeva jooksul loodud arved"
 
 #. module: account
-#: model:ir.model,name:account.model_report_invoice_created
+#: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Viimase 15 päeva jooksul loodud arvete aruanne"
 
@@ -5991,12 +6214,12 @@ msgid "Accounts by type"
 msgstr "Kontod tüübi järgi"
 
 #. module: account
-#: model:ir.model,name:account.model_report_aged_receivable
+#: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
 msgstr "Aegunud nõuded kuni tänaseni"
 
 #. module: account
-#: model:ir.model,name:account.model_report_account_receivable
+#: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
 msgstr "Laekumiskontod"
 
@@ -6006,25 +6229,25 @@ msgid "Range"
 msgstr "Vahemik"
 
 #. module: account
-#: model:ir.module.module,description:account.module_meta_information
+#: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
 msgstr "Moodul, mis lisab uusi aruandeid konto mooduli põhjal."
 
 #. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
 msgstr "Konto aruandlus - Aruandlus"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_receivable_graph
-#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
 msgstr "Bilanss kontotüübi järgi"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr "Nädal"
+msgstr ""
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -6032,7 +6255,7 @@ msgid "Create Date"
 msgstr "Loomise kuupäev"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
 msgstr "Aegunud nõuded"
@@ -6041,3 +6264,75 @@ msgstr "Aegunud nõuded"
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
 msgstr "Maksuvaba summa"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Ettevaatust !"
+
+#, python-format
+#~ msgid "You must first select a partner !"
+#~ msgstr "Sa pead esmalt valima partneri !"
+
+#, python-format
+#~ msgid "End of Fiscal Year Entry"
+#~ msgstr "Majandusaasta lõpp"
+
+#, python-format
+#~ msgid "This period is already closed !"
+#~ msgstr "See periood on juba suletud !"
+
+#, python-format
+#~ msgid "Closing of fiscal year cancelled, please check the box !"
+#~ msgstr "Majandusaasta sulgemine tühistatud, palun märgi kastike !"
+
+#, python-format
+#~ msgid "Taxes missing !"
+#~ msgstr "Maks puudub !"
+
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "Terviklikkuse viga !"
+
+#, python-format
+#~ msgid "You can not use an inactive account!"
+#~ msgstr "Sa ei saa kasutada mitteaktiivset kontot!"
+
+#, python-format
+#~ msgid "Bank Journal "
+#~ msgstr "Panga päevik "
+
+#, python-format
+#~ msgid "Account move line \"%s\" is not valid"
+#~ msgstr "Konto liigutuskirje \"%s\" ei ole õige"
+
+#, python-format
+#~ msgid "You can not add/modify entries in a closed journal."
+#~ msgstr "Teie ei saa lisada/muuta suletud päeviku kirjeid."
+
+#, python-format
+#~ msgid ""
+#~ "Specified Journal does not have any account move entries in draft state for "
+#~ "this period"
+#~ msgstr ""
+#~ "Valitud päevik ei sisalda konto liigutuskirjeid mustandolekus sellel "
+#~ "perioodil"
+
+#, python-format
+#~ msgid "You have to provide an account for the write off entry !"
+#~ msgstr "Te peate valima konto mahakandmise kirje jaoks !"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "Puudub analüütiline päevik !"
+
+#, python-format
+#~ msgid "You can not use this general account in this journal !"
+#~ msgstr "Te ei saa kasutada üldist kontot selles päevikus !"
+
+#, python-format
+#~ msgid "The opening journal must not have any entry in the new fiscal year !"
+#~ msgstr "Avatav päevik ei tohi sisaldama kirjeid uues finantsaastas !"
+
+#, python-format
+#~ msgid "The account entries lines are not in valid state."
+#~ msgstr "Konto kirjete read ei ole õiges olekus."
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 62a2d826964..ff71f9efc36 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2010-07-08 08:56+0000\n"
+"PO-Revision-Date: 2010-07-28 12:08+0000\n"
 "Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -193,8 +193,6 @@ msgstr "Seleziona la riga del movimento"
 #. module: account
 #: rml:account.journal.period.print:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Inserisci etichetta"
 
@@ -239,7 +237,6 @@ msgstr "Voci ricorrenti"
 #: field:account.move,amount:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
-#: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Importo"
 
@@ -309,7 +306,6 @@ msgstr "Ritardo Pagamenti"
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -349,11 +345,12 @@ msgid "Delta Debit"
 msgstr "Delta di Debito"
 
 #. module: account
+#: model:account.account.type,name:account.account_type_tax
 #: rml:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "Tassa"
+msgstr "Imposte"
 
 #. module: account
 #: rml:account.general.journal:0
@@ -363,7 +360,9 @@ msgstr "Debito Trans."
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Contabilità Analitica"
@@ -684,8 +683,11 @@ msgstr "Sub-totale"
 #. module: account
 #: field:account.analytic.account,line_ids:0
 #: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Voci analitiche"
 
@@ -700,6 +702,7 @@ msgid "Associated Partner"
 msgstr "Partner associato"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Informazioni Aggiuntive"
@@ -1473,6 +1476,9 @@ msgstr "Lasciare vuoto per usare il conto di ricavo"
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr ""
 
@@ -1879,7 +1885,6 @@ msgstr ""
 #: field:account.journal,type:0
 #: field:account.move,type:0
 #: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -2315,13 +2320,13 @@ msgstr ""
 #: selection:account.general.ledger.report,checktype,sortbydate:0
 #: rml:account.journal.period.print:0
 #: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
 #: field:account.subscription.line,date:0
 #: rml:account.tax.code.entries:0
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
 msgid "Date"
 msgstr "Data"
 
@@ -2438,6 +2443,7 @@ msgstr "Data fine"
 #: view:account.bank.statement:0
 #: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
@@ -2629,6 +2635,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2732,6 +2740,7 @@ msgid "Invoice Number"
 msgstr "Numero fattura"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr ""
@@ -2915,8 +2924,6 @@ msgstr ""
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
@@ -2973,9 +2980,11 @@ msgstr "Righe movimento"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr "Riconciliazione"
 
@@ -3035,7 +3044,6 @@ msgstr "Situazione"
 
 #. module: account
 #: rml:account.invoice:0
-#: xsl:account.transfer:0
 msgid "Document"
 msgstr "Documento"
 
@@ -3083,6 +3091,8 @@ msgstr "Libro Giornale analitico"
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr ""
 
@@ -3276,6 +3286,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr ""
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr "Riconcilia registrazioni"
@@ -3625,7 +3636,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr ""
@@ -4940,6 +4950,7 @@ msgid "Invoice Lines"
 msgstr ""
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr ""
@@ -5213,7 +5224,7 @@ msgstr ""
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
-msgstr ""
+msgstr "Pagamenti"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@@ -5332,8 +5343,6 @@ msgstr ""
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
@@ -5342,7 +5351,7 @@ msgstr ""
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Optional Information"
-msgstr ""
+msgstr "Informazioni aggiuntive"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
@@ -5415,7 +5424,6 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5501,7 +5509,7 @@ msgstr ""
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Informazioni Generali"
 
 #. module: account
 #: help:populate_statement_from_inv,init,journal_id:0
@@ -5604,7 +5612,6 @@ msgstr "Anno fiscale da chiudere"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -6126,7 +6133,7 @@ msgid "Show Comparision in %"
 msgstr ""
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
 msgstr ""
 
@@ -6290,3 +6297,92 @@ msgstr ""
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
 msgstr ""
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"
+
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "Errore di Integrità!"
+
+#, python-format
+#~ msgid ""
+#~ "Specified Journal does not have any account move entries in draft state for "
+#~ "this period"
+#~ msgstr ""
+#~ "Il Giornale specificato non ha nessun movimento in stato di bozza per questo "
+#~ "periodo"
+
+#, python-format
+#~ msgid "You have to provide an account for the write off entry !"
+#~ msgstr "Occorre inserire un conto per la scrittura della registrazione"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Attenzione !"
+
+#, python-format
+#~ msgid "You can not delete posted movement: \"%s\"!"
+#~ msgstr "Non è possibile cancellare il movimento registrato \"%s\"!"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "Nessun Giornale analitico presente!"
+
+#, python-format
+#~ msgid "You can not use this general account in this journal !"
+#~ msgstr "Non è possibile utilizzare questo conto generale in questo giornale!"
+
+#, python-format
+#~ msgid "You can not add/modify entries in a closed journal."
+#~ msgstr "Non si può aggiungere/modificare registrazioni in un giornale chiuso"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a reconciled entry ! Please note that "
+#~ "you can just change some non important fields !"
+#~ msgstr ""
+#~ "Non si può fare questa modifica su una registrazione riconcigliata! Per "
+#~ "cortesia, osservare che si possono modificare solo campi non importanti!"
+
+#, python-format
+#~ msgid "You must first select a partner !"
+#~ msgstr "Bisogna prima selezionare un partner!"
+
+#, python-format
+#~ msgid "Free Reference"
+#~ msgstr "Riferimenti vari"
+
+#, python-format
+#~ msgid "Entries are not of the same account or already reconciled ! "
+#~ msgstr "Registrazioni non nello stesso conto, oppure già riconciliate! "
+
+#, python-format
+#~ msgid "Invalid action !"
+#~ msgstr "Azione non valida !"
+
+#, python-format
+#~ msgid "Some entries are already reconciled !"
+#~ msgstr "Alcune registrazioni sono già riconciliate !"
+
+#, python-format
+#~ msgid "The account entries lines are not in valid state."
+#~ msgstr "Queste registrazioni contabili non sono in uno stato valido."
+
+#, python-format
+#~ msgid "Sales Journal"
+#~ msgstr "Giornale Vendite"
+
+#, python-format
+#~ msgid "You can not modify/delete a journal with entries for this period !"
+#~ msgstr ""
+#~ "Non puoi modificare/cancellare un giornale con registrazioni per questo "
+#~ "periodo !"
+
+#, python-format
+#~ msgid "Entries: "
+#~ msgstr "Registrazioni: "
+
+#, python-format
+#~ msgid "Entry is already reconciled"
+#~ msgstr "La registrazione è già stata riconciliata"
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index a95a1361ea2..63ddc4a40d0 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* account
+#	* account
 #
 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"
-"PO-Revision-Date: 2009-11-18 06:22+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-07-21 09:22+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-06-22 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -50,7 +50,7 @@ msgstr "Patvirtinti dokumentą iš juodraščio"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr "Turtas"
+msgstr ""
 
 #. module: account
 #: constraint:ir.actions.act_window:0
@@ -90,7 +90,8 @@ msgid "Unreconciled entries"
 msgstr "Nesugretinti įrašai"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Bazės kodas"
@@ -122,7 +123,8 @@ msgid "Residual"
 msgstr ""
 
 #. module: account
-#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -183,8 +185,8 @@ msgid "Move line select"
 msgstr "Perkelti pasirinktą eilutę"
 
 #. module: account
-#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0
+#: rml:account.tax.code.entries:0
 msgid "Entry label"
 msgstr "Įrašo žymė"
 
@@ -199,14 +201,16 @@ msgid "Period Sum"
 msgstr "Periodo suma"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Apskaičiuoti Kodą (jei tipas=kodas)"
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr "Sąskaitos įrašo eilutė"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
@@ -221,10 +225,12 @@ msgstr "Pasikartojantys įrašai"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
-#: field:account.invoice.tax,amount:0 field:account.move,amount:0
-#: field:account.tax,amount:0 field:account.tax.template,amount:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.reconcile.line,amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: field:account.move,amount:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
 msgid "Amount"
 msgstr "Kiekis"
 
@@ -243,7 +249,7 @@ msgstr "Tiekėjo mokesčiai"
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr "Iš viso debeto"
+msgstr ""
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -260,7 +266,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -269,19 +276,20 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0 selection:account.tax.template,type:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fiksuotas"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
 msgid "Overdue Payments"
 msgstr "Priminimo pažyma"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -290,7 +298,8 @@ msgid "Select period"
 msgstr "Parinkite periodą"
 
 #. module: account
-#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Kilmės vieta"
 
@@ -320,7 +329,9 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice,amount_tax:0
+#: model:account.account.type,name:account.account_type_tax
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Mokestis"
@@ -333,18 +344,22 @@ msgstr "Debeto transakcijos"
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Analitinė sąskaita"
 
 #. module: account
-#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Žurnalo pavadinimas"
@@ -412,8 +427,11 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
-#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
+#: field:account.analytic.account,state:0
+#: field:account.bank.statement,state:0
+#: field:account.invoice,state:0
+#: view:account.move:0
+#: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Apskritis, rajonas:"
@@ -425,7 +443,8 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Neapmokėti tiekėjo grąžinimai"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Specialus apskaičiavimas"
 
@@ -447,8 +466,10 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0 field:account.model,ref:0
-#: field:account.move,ref:0 rml:account.overdue:0
+#: rml:account.general.ledger:0
+#: field:account.model,ref:0
+#: field:account.move,ref:0
+#: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Nuoroda"
@@ -643,9 +664,13 @@ msgid "Sub-Total :"
 msgstr "Dalinė suma :"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0
+#: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Analitiniai įrašai"
 
@@ -660,6 +685,7 @@ msgid "Associated Partner"
 msgstr "Susijęs kontrahentas"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Papildoma informacija"
@@ -675,7 +701,8 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -707,7 +734,8 @@ msgid "Field Name"
 msgstr "Lauko Pavadinimas"
 
 #. module: account
-#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0
+#: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Ženklas, naudojamas skaičiuojant aukštesnįjį mokestį."
 
@@ -717,7 +745,8 @@ msgid "End of Year Entries Journal"
 msgstr "Fiskalinių metų uždarymo įrašų žurnalas"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Purchase Properties"
 msgstr "Pirkimo ypatybės"
 
@@ -737,9 +766,12 @@ msgid "Move Lines Created."
 msgstr "Sukurti didžiosios knygos įrašai."
 
 #. module: account
-#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
-#: field:account.move,state:0 field:account.move.line,state:0
-#: field:account.period,state:0 field:account.subscription,state:0
+#: field:account.fiscalyear,state:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: field:account.subscription,state:0
 msgid "Status"
 msgstr "Būsena"
 
@@ -894,8 +926,10 @@ msgstr "Pasirinkite sąskaitų planą"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
-#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Kiekis"
@@ -938,13 +972,16 @@ msgstr "analitinė sąskaita faktūra"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0 rml:account.general.journal:0
+#: view:account.fiscalyear:0
+#: rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0 field:account.move,period_id:0
+#: field:account.journal.period,period_id:0
+#: field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0
+#: view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -966,7 +1003,8 @@ msgid "Net Total:"
 msgstr "Iš viso be mokesčių:"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1090,7 +1128,8 @@ msgid "Fiscal Position Templates"
 msgstr "Fiskalinės pozicijos šablonai"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Vieneto kaina"
 
@@ -1243,7 +1282,8 @@ msgid "Not reconciled transactions"
 msgstr "Nesugretintos transakcijos"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Mokesčių nustatymai"
@@ -1265,7 +1305,8 @@ msgid "Write-Off account"
 msgstr "Nurašymų sąskaita"
 
 #. module: account
-#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0
+#: field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Modelis"
 
@@ -1291,9 +1332,11 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0
+#: field:account.journal,view_id:0
 msgid "View"
 msgstr "Žiūrėti"
 
@@ -1364,7 +1407,8 @@ msgstr "Sąskaitų tipai"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1380,7 +1424,8 @@ msgid "Journal"
 msgstr "Žurnalas"
 
 #. module: account
-#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0
+#: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Žemesniosios sąskaitos"
 
@@ -1406,7 +1451,8 @@ msgid "Statement reconcile line"
 msgstr "Dokumento sugretinimo eilutė"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Norėdami naudoti pajamų sąskaitą, palikite tuščią"
 
@@ -1415,6 +1461,9 @@ msgstr "Norėdami naudoti pajamų sąskaitą, palikite tuščią"
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr "Nurašymas"
 
@@ -1533,7 +1582,8 @@ msgid "Account n°"
 msgstr "Sąskaitos Nr."
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Norėdami naudoti sąnaudų sąskaitą, palikite tuščią"
 
@@ -1543,7 +1593,8 @@ msgid "Account to reconcile"
 msgstr "Sąskaita sugertinimui"
 
 #. module: account
-#: rml:account.invoice:0 field:account.model.line,partner_id:0
+#: rml:account.invoice:0
+#: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Kontrahento nuoroda"
@@ -1555,12 +1606,14 @@ msgid "Receivable and Payable Accounts"
 msgstr "Debetinės ir kreditinės sąskaitos"
 
 #. module: account
-#: view:account.subscription:0 field:account.subscription,lines_id:0
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Periodiniai įrašai"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1724,7 +1777,8 @@ msgid "Period length (days)"
 msgstr "Periodo trukmė (dienomis)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procentų"
@@ -1735,7 +1789,8 @@ msgid "Charts"
 msgstr "Sąskaitų planas"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1810,9 +1865,11 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
-#: field:account.journal,type:0 field:account.move,type:0
-#: field:account.move.reconcile,type:0 xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: field:account.journal,type:0
+#: field:account.move,type:0
+#: field:account.move.reconcile,type:0
 msgid "Type"
 msgstr "Tipas"
 
@@ -1926,7 +1983,7 @@ msgstr "Spausdinimo data"
 #. module: account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Netinkamas XML peržiūros architektūrai!"
 
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
@@ -1942,7 +1999,7 @@ msgstr "Analitinio žurnalo ataskaita"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Neapmokėti kliento grąžinimai"
+msgstr "Kliento grąžinimai"
 
 #. module: account
 #: rml:account.vat.declaration:0
@@ -1960,7 +2017,8 @@ msgid "Journal-Period Name"
 msgstr "Žurnalo-periodo pavadinimas"
 
 #. module: account
-#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Mokesčio pavadinimas"
 
@@ -1977,7 +2035,8 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2052,8 +2111,10 @@ msgstr "Praeitis"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
-#: field:account.journal,currency:0 field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.journal,currency:0
+#: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Valiuta"
@@ -2091,7 +2152,8 @@ msgid "Analytic Entry"
 msgstr "Analitinis įrašas"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2143,7 +2205,8 @@ msgid "Detail"
 msgstr "Išsamiai"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Konsilidacija"
 
@@ -2208,9 +2271,13 @@ msgid "Date Invoiced"
 msgstr "Sąskaitos faktūros data"
 
 #. module: account
-#: help:account.balance.account.balance.report,init,periods:0
+#: help:account.account.balance.report,checktype,periods:0
+#: help:account.general.ledger.report,checktype,periods:0
+#: help:account.partner.balance.report,init,periods:0
+#: help:account.third_party_ledger.report,init,periods:0
+#: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr "Visi periodai tušti"
+msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2235,17 +2302,22 @@ msgid "The account basis of the tax declaration."
 msgstr "Deklaruojama mokesčių suma"
 
 #. module: account
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0
+#: rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0 field:account.move,date:0
+#: rml:account.journal.period.print:0
+#: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
+#: field:account.subscription.line,date:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Date"
 msgstr "Data"
 
@@ -2261,7 +2333,8 @@ msgid "Unreconcile"
 msgstr "Panaikinti sugretinimą"
 
 #. module: account
-#: field:account.tax,type:0 field:account.tax.template,type:0
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Mokesčių tipas"
 
@@ -2271,7 +2344,8 @@ msgid "Statement Entries"
 msgstr "Dokumentų įrašai"
 
 #. module: account
-#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0
+#: field:account.journal,user_id:0
 msgid "User"
 msgstr "Naudotojas"
 
@@ -2359,15 +2433,18 @@ msgid "Date End"
 msgstr "Pabaigos data"
 
 #. module: account
-#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0
+#: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
 msgstr "Įrašo eilutės"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Pritaikomas Kodas (jei tipas=kodas)"
 
@@ -2456,9 +2533,11 @@ msgstr "Iš analitinių sąskaitų sukuriama sąskaita faktūra"
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0
+#: wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0
+#: view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2477,7 +2556,8 @@ msgstr "Iš analitinių sąskaitų sukuriama sąskaita faktūra"
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -2487,8 +2567,10 @@ msgid "Acc. Type Name"
 msgstr "Sąsk. tipo pavadinimas"
 
 #. module: account
-#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2502,7 +2584,8 @@ msgid "Litigation"
 msgstr "Ginčytinas"
 
 #. module: account
-#: view:account.move.line:0 wizard_view:account.move.validate,init:0
+#: view:account.move.line:0
+#: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Informacija"
@@ -2547,6 +2630,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2561,7 +2646,7 @@ msgstr "Sukurti sąskaitą faktūrą"
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
 msgid "Equity"
-msgstr "Kapitalas"
+msgstr ""
 
 #. module: account
 #: field:wizard.company.setup,overdue_msg:0
@@ -2614,7 +2699,8 @@ msgid "Price"
 msgstr "Kaina"
 
 #. module: account
-#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2649,6 +2735,7 @@ msgid "Invoice Number"
 msgstr "Sąskaitos faktūros numeris"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr "Periodo pabaiga"
@@ -2681,13 +2768,17 @@ msgid "Invoice Reference"
 msgstr "Sąskaitos faktūros nuoroda"
 
 #. module: account
-#: field:account.account,name:0 field:account.account.template,name:0
+#: field:account.account,name:0
+#: field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0 field:account.config.wizard,name:0
-#: field:account.model.line,name:0 field:account.move,name:0
-#: field:account.move.line,name:0 field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0
+#: field:account.config.wizard,name:0
+#: field:account.model.line,name:0
+#: field:account.move,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Pavadinimas"
@@ -2727,7 +2818,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0 view:account.journal.view:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2758,7 +2850,7 @@ msgstr "Nurašymų įrašai"
 #. module: account
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr "Iš viso kredito:"
+msgstr "Iš viso kredito"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1_new
@@ -2820,11 +2912,14 @@ msgid "Full Account Name"
 msgstr "Sąskaitos pavadinimas"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2845,7 +2940,9 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0 view:product.template:0 view:res.partner:0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
 msgid "Accounting"
 msgstr "Apskaita"
 
@@ -2878,9 +2975,11 @@ msgstr "Įrašo eilutės"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr "Gretinimas"
 
@@ -2890,8 +2989,10 @@ msgid "Centralisation"
 msgstr "Centralizacija"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
-#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax,tax_code_id:0
+#: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Mokesčių kodas"
@@ -2931,12 +3032,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situacija"
 
 #. module: account
-#: rml:account.invoice:0 xsl:account.transfer:0
+#: rml:account.invoice:0
 msgid "Document"
 msgstr "Dokumentas"
 
@@ -2974,7 +3076,8 @@ msgid "Cancel selected invoices"
 msgstr "Atšaukti parinktas sąskaitas faktūras"
 
 #. module: account
-#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -2983,6 +3086,8 @@ msgstr "Analitinis žurnalas"
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr "Įrašo žymė"
 
@@ -2997,23 +3102,28 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Nustatyti kaip juodraštį"
 
 #. module: account
-#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Dokumento, kuris sugeneravo šią sąskaitą faktūrą nuoroda."
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Kreditoriai"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.tax,base:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Bazė"
 
@@ -3023,7 +3133,8 @@ msgid "Model Name"
 msgstr "Modelio pavadinimas"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Others"
 msgstr "Kita"
 
@@ -3033,13 +3144,15 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0 view:account.move:0
+#: view:account.invoice:0
+#: view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Patvirtinti"
 
 #. module: account
-#: view:account.model:0 field:account.model,legend:0
+#: view:account.model:0
+#: field:account.model,legend:0
 msgid "Legend"
 msgstr "Legenda"
 
@@ -3054,14 +3167,17 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0 rml:account.account.balance:0
+#: view:account.account:0
+#: rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0
+#: field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3082,9 +3198,12 @@ msgid "By Date and Period"
 msgstr "Pagal datą ir periodą"
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0 view:account.invoice.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Pastabos"
@@ -3097,7 +3216,8 @@ msgid ""
 msgstr "Sąskaitos faktūros DK įrašai sugretinti su mokėjimų DK įrašais."
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3122,15 +3242,21 @@ msgid "Statement encoding produces payment entries"
 msgstr "Dokumentai padeda sukurti mokėjimo eilutes"
 
 #. module: account
-#: field:account.account,code:0 rml:account.account.balance:0
-#: field:account.account.template,code:0 field:account.account.type,code:0
+#: field:account.account,code:0
+#: rml:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
-#: rml:account.general.journal:0 field:account.journal,code:0
-#: rml:account.partner.balance:0 field:account.period,code:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0
+#: field:account.fiscalyear,code:0
+#: rml:account.general.journal:0
+#: field:account.journal,code:0
+#: rml:account.partner.balance:0
+#: field:account.period,code:0
 msgid "Code"
 msgstr "Kodas"
 
@@ -3140,7 +3266,8 @@ msgid "Financial Management"
 msgstr "Finansų valdymas"
 
 #. module: account
-#: selection:account.account.type,close_method:0 selection:account.tax,type:0
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Nieko"
@@ -3152,6 +3279,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr "Generuoti fiskalinių metų atviras eilutes"
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr "Sugretinti įrašus"
@@ -3168,7 +3296,8 @@ msgid "Additionnal Information"
 msgstr "Papildoma informacija"
 
 #. module: account
-#: field:account.tax,name:0 field:account.tax.template,name:0
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Mokesčio pavadinimas"
@@ -3245,7 +3374,8 @@ msgid "Partner Balance"
 msgstr "Kontrahento likutis"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Kontrahento žurnalas"
 
@@ -3254,11 +3384,13 @@ msgstr "Kontrahento žurnalas"
 msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
-msgstr "Ši sąskaita bus naudojama vietoj numatytosios, pirkėjo skolai žymėti."
+msgstr ""
+"Ši sąskaita bus naudojama vietoj numatytosios, pirkėjo skolai žymėti."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3297,7 +3429,8 @@ msgid "Import invoice"
 msgstr "Importuoti sąskaitą faktūrą"
 
 #. module: account
-#: view:account.invoice:0 view:wizard.company.setup:0
+#: view:account.invoice:0
+#: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Sukurti"
@@ -3313,7 +3446,8 @@ msgid "Invoice line"
 msgstr "Sąskaitos faktūros eilutė"
 
 #. module: account
-#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Nuoroda"
 
@@ -3342,13 +3476,15 @@ msgstr ""
 "valiutų įrašai."
 
 #. module: account
-#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Aukštesnioji mokesčių sąskaita"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0 view:account.account.type:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3384,7 +3520,8 @@ msgid "Central Journal"
 msgstr "Centrinis žurnalas"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3460,7 +3597,8 @@ msgid "Journal code"
 msgstr "Žurnalo kodas"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0
+#: view:account.model:0
 msgid "Create entries"
 msgstr "Sukurti įrašus"
 
@@ -3497,7 +3635,6 @@ msgid ""
 msgstr "Šis mokėjimo terminas bus naudojamas vietoj numatytojo."
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr "Įrašo pavadinimas"
@@ -3518,11 +3655,14 @@ msgstr ""
 "mokesčio kodu būtų rodomas sąskaitoje faktūroje."
 
 #. module: account
-#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Seka"
@@ -3590,7 +3730,8 @@ msgstr "Periodiniai įrašai"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0 rml:account.overdue:0
+#: field:account.move.line,date_maturity:0
+#: rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Mokėjimo data"
 
@@ -3610,7 +3751,8 @@ msgid "Account Configure Wizard "
 msgstr "Sąskaitų konfigūravimo vedlys "
 
 #. module: account
-#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3648,7 +3790,8 @@ msgid "Unreconciled"
 msgstr "Nesugretinta"
 
 #. module: account
-#: field:account.account,note:0 field:account.account.template,note:0
+#: field:account.account,note:0
+#: field:account.account.template,note:0
 msgid "Note"
 msgstr "Pastaba"
 
@@ -3672,7 +3815,8 @@ msgid "Entry Sequence"
 msgstr "Įrašų seka"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Uždaryta"
 
@@ -3797,9 +3941,12 @@ msgid "Code/Date"
 msgstr "Kodas/Data"
 
 #. module: account
-#: field:account.account,active:0 field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0 field:account.journal,active:0
-#: field:account.journal.period,active:0 field:account.payment.term,active:0
+#: field:account.account,active:0
+#: field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktyvus"
@@ -3851,15 +3998,20 @@ msgid "Secondary Currency"
 msgstr "Antroji valiuta"
 
 #. module: account
-#: field:account.account,credit:0 rml:account.account.balance:0
+#: field:account.account,credit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.journal.period.print:0
-#: field:account.model.line,credit:0 field:account.move.line,credit:0
-#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3892,7 +4044,8 @@ msgid "Account Move"
 msgstr "Didžiosios knygos įrašai"
 
 #. module: account
-#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Dokumento eilutės"
 
@@ -3989,15 +4142,18 @@ msgid "Journal Column"
 msgstr "Žurnalo stulpelis"
 
 #. module: account
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Atlikta"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0 view:account.fiscalyear:0
+#: field:account.config.wizard,period:0
+#: view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4010,7 +4166,8 @@ msgid "Periods"
 msgstr "Periodai"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4037,7 +4194,8 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Numatytieji mokesčiai"
 
@@ -4046,6 +4204,7 @@ msgstr "Numatytieji mokesčiai"
 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
 #: help:account.account.type,sign:0
@@ -4094,7 +4253,8 @@ msgstr "Tipų kontrolė"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Sąskaitos pavadinimas"
 
@@ -4185,7 +4345,8 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0 field:account.account.template,type:0
+#: field:account.account,type:0
+#: field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Vidinis tipas"
 
@@ -4211,12 +4372,14 @@ msgid "Posted"
 msgstr "Užregistruota"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Grąžinimas"
 
 #. module: account
-#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0
+#: field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4237,7 +4400,8 @@ msgid "Day of the Month"
 msgstr "Mėnesio diena"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Eilutės"
 
@@ -4258,7 +4422,8 @@ msgstr ""
 "mokesčių. Šiuo atveju vertinimo seka yra svarbi."
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Mokesčių deklaracija"
 
@@ -4318,12 +4483,14 @@ msgid "The optional quantity on entries"
 msgstr "Rodomas kiekis įrašuose"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0 view:account.period:0
+#: view:account.fiscalyear:0
+#: view:account.period:0
 msgid "States"
 msgstr "Būsenos"
 
@@ -4337,7 +4504,7 @@ msgstr "Apskaitos įrašai"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
 msgid "Receivables & Payables"
-msgstr "Debitoriai ir kreditoriai"
+msgstr ""
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -4359,7 +4526,8 @@ msgstr "Pradžios data"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Iš viso"
 
@@ -4476,9 +4644,11 @@ msgstr "Patvirtinti įrašus iš sąskaitos faktūros"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0 field:account.journal,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4575,9 +4745,12 @@ msgid "Print Aged Trial Balance"
 msgstr "Spausdinti bandomąjį balansą"
 
 #. module: account
-#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0 field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0
+#: field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Nuoroda"
 
@@ -4654,7 +4827,8 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Gautinos sumos"
@@ -4681,7 +4855,8 @@ msgstr "PVM:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Iš viso:"
@@ -4692,7 +4867,8 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Sąskaitų nustatymai"
@@ -4708,7 +4884,8 @@ msgid "Account Reconciliation"
 msgstr "Sąskaitos sugretinimas"
 
 #. module: account
-#: view:account.bank.statement:0 selection:account.bank.statement,state:0
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Patvirtinti"
 
@@ -4723,7 +4900,8 @@ msgid "Parent Account Template"
 msgstr "Aukštesnysis sąskaitos šablonas"
 
 #. module: account
-#: help:account.tax,domain:0 help:account.tax.template,domain:0
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4741,7 +4919,8 @@ msgid "Analytic account"
 msgstr "Analitinė sąskaita"
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Tiekėjo sąskaita faktūra"
 
@@ -4751,16 +4930,22 @@ msgid "Valid"
 msgstr "Patvirtinta"
 
 #. module: account
-#: field:account.account,debit:0 rml:account.account.balance:0
+#: field:account.account,debit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 field:account.model.line,debit:0
-#: field:account.move.line,debit:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.central.journal:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Debetas"
@@ -4768,7 +4953,7 @@ msgstr "Debetas"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_42
 msgid "All Months"
-msgstr "Visi mėnesiai"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.invoice.refund,init,date:0
@@ -4781,6 +4966,7 @@ msgid "Invoice Lines"
 msgstr "Sąskaitos faktūros eilutės"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr "Periodo pradžia"
@@ -4819,10 +5005,11 @@ msgstr "Sugretintos transakcijos"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr "Ataskaitos"
+msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -4853,7 +5040,8 @@ msgid "Configuration"
 msgstr "Nustatymai"
 
 #. module: account
-#: view:account.analytic.line:0 view:account.invoice:0
+#: view:account.analytic.line:0
+#: view:account.invoice:0
 msgid "Total amount"
 msgstr "Iš viso"
 
@@ -4903,12 +5091,14 @@ msgid "Paid invoice"
 msgstr "Apmokėta sąskaita"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Mokesčio aprašymas"
 
 #. module: account
-#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0
+#: field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Mokesčių grupė"
 
@@ -4951,7 +5141,8 @@ msgid "With movements"
 msgstr "Su DK įrašais"
 
 #. module: account
-#: field:account.tax,domain:0 field:account.tax.template,domain:0
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Sritis"
 
@@ -4976,7 +5167,9 @@ msgid "Manually"
 msgstr "Rankiniu būdu"
 
 #. module: account
-#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -4993,7 +5186,8 @@ msgid "Payable Accounts"
 msgstr "Kreditinės sąskaitos"
 
 #. module: account
-#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Sąskaitos faktūros eilutė"
 
@@ -5031,7 +5225,7 @@ msgstr "Rankiniu būdu sukurtas dokumentas tampa dokumento juodraščiu"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
 msgid "This Month"
-msgstr "Šis mėnuo"
+msgstr ""
 
 #. module: account
 #: field:account.account.type,sign:0
@@ -5044,7 +5238,8 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "Pasirenkama kita valiuta, jeigu tai kelių valiutų įrašas."
 
 #. module: account
-#: view:account.invoice:0 field:account.invoice,payment_ids:0
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Mokėjimai"
@@ -5090,9 +5285,12 @@ msgstr "Pasirinkti žurnalą ir mokėjimo datą"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.move,state:0
-#: selection:account.move.line,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.move,state:0
+#: selection:account.move.line,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Juodraštis"
@@ -5119,7 +5317,8 @@ msgid "Are you sure ?"
 msgstr "Jūs esate įsitikinęs?"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Išankstinė sąskaita"
 
@@ -5155,16 +5354,20 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Puslapis"
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Optional Information"
 msgstr "Papildoma informacija"
 
@@ -5180,7 +5383,8 @@ msgid "Receivable and Payable"
 msgstr "Mokėtinos ir gautinos"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.general.journal:0
+#: rml:account.account.balance:0
+#: rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5203,7 +5407,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Skaičiuoti"
@@ -5237,7 +5442,6 @@ msgstr "Periodų skaičius"
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5247,7 +5451,8 @@ msgid "End of period"
 msgstr "Periodo pabaiga"
 
 #. module: account
-#: view:account.move:0 model:ir.model,name:account.model_account_move
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Sąskaitos įrašas"
 
@@ -5258,7 +5463,8 @@ msgid "General Journal"
 msgstr "Bendrasis žurnalas"
 
 #. module: account
-#: field:account.account,balance:0 rml:account.account.balance:0
+#: field:account.account,balance:0
+#: rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5266,9 +5472,12 @@ msgstr "Bendrasis žurnalas"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0 field:account.move.line,balance:0
-#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0 rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: rml:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Likutis"
@@ -5314,8 +5523,11 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "Seka naudojama šiame žurnale sąskaitoms faktūroms numeruoti."
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.journal:0 view:account.move:0 view:account.move.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "General Information"
 msgstr "Bendroji informacija"
 
@@ -5357,7 +5569,8 @@ msgid "List of Accounts"
 msgstr "Sąskaitų sąrašas"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Sales Properties"
 msgstr "Pardavimų nustatymai"
 
@@ -5422,7 +5635,6 @@ msgstr "Uždarytini fiskaliniai metai"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5450,11 +5662,15 @@ msgstr "IntraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
-#: field:account.invoice,name:0 field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0
+#: rml:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0 field:account.payment.term,note:0
-#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
+#: rml:account.overdue:0
+#: field:account.payment.term,note:0
+#: field:account.tax.code,info:0
+#: field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Aprašas"
 
@@ -5502,7 +5718,8 @@ msgstr ""
 "kontrahentui."
 
 #. module: account
-#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Įvykio kodas"
 
@@ -5584,7 +5801,8 @@ msgstr "Modelių apibrėžimai"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Cash"
 msgstr "Grynieji"
 
@@ -5624,7 +5842,8 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Palikite tuščią visiems atviriems fiskaliniams metams."
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Grąžinimas tiekėjui"
 
@@ -5671,8 +5890,10 @@ msgid ""
 msgstr "Sąskaita bus naudojama įvertinti siunčiamas atsargas."
 
 #. module: account
-#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5706,8 +5927,10 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Fiskalinių metų pavadinimas rodomas ekrane."
 
 #. module: account
-#: field:account.invoice,payment_term:0 view:account.payment.term:0
-#: field:account.payment.term,name:0 view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5766,7 +5989,8 @@ msgstr "Taip"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid "Check this if the user is allowed to reconcile entries in this account."
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Pažymėkite, jeigu norite, kad vartotojas galėtų kurti sugretinimo įrašus "
 "šiai sąskaitai."
@@ -5793,7 +6017,8 @@ msgid "Accounting Dashboard"
 msgstr ""
 
 #. module: account
-#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
 msgstr ""
 
@@ -5836,54 +6061,54 @@ msgstr ""
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
 msgid "Show Debit/Credit Information"
-msgstr "Rodyti debeto/kredito informaciją"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr "Visos sąskaitos"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
 msgid "Entries Selection Based on"
-msgstr "Įrašų pasirinkimas pagrįstas"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr "Perspėjimas"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr "Financinis periodas"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr "Sąskaitos balansas"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr "Parinkti periodą(-us)"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr "Procentaliai"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Compare Selected Years In Terms Of"
-msgstr "Palyginti pasirinktus metus pagal"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr "Parinkti fiskalinius metus (daugiausia tris metus)"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
@@ -5893,7 +6118,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr "Sąskaitos balansas-Palyginimo metai"
+msgstr ""
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -5936,27 +6161,27 @@ msgstr ""
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
 msgid "Show Comparision in %"
-msgstr "Parodyti palyginimą %"
+msgstr ""
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
-msgstr "Pasirinkti periodą"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr "Ataskaitos nustatymai"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr "Nelyginti"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr "Rodyti sąskaitas"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6000,7 +6225,7 @@ msgstr ""
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr "Sukūrimo data"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6012,9 +6237,9 @@ msgstr ""
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid ""
-"You may have selected the compare options with more than 1 year with credit/"
-"debit columns and % option.This can lead contents to be printed out of the "
-"paper.Please try again."
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
 msgstr ""
 
 #. module: account
@@ -6033,12 +6258,12 @@ msgid "Month Range"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_invoice_created
+#: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
@@ -6053,12 +6278,12 @@ msgid "Accounts by type"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_aged_receivable
+#: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_account_receivable
+#: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
 msgstr ""
 
@@ -6068,18 +6293,18 @@ msgid "Range"
 msgstr ""
 
 #. module: account
-#: model:ir.module.module,description:account.module_meta_information
+#: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
 msgstr ""
 
 #. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_receivable_graph
-#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
 msgstr ""
 
@@ -6094,7 +6319,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
 msgstr ""
@@ -6103,3 +6328,279 @@ msgstr ""
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
 msgstr ""
+
+#, python-format
+#~ msgid "Bank Journal "
+#~ msgstr "Banko žurnalas "
+
+#, python-format
+#~ msgid "You must first select a partner !"
+#~ msgstr "Visų pirma turite pasirinkti kontrahentą !"
+
+#, python-format
+#~ msgid "Sales Journal"
+#~ msgstr "Pardavimų žurnalas"
+
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "Integracijos klaida !"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Klaida !"
+
+#, python-format
+#~ msgid "Bad account !"
+#~ msgstr "Bloga sąskaita !"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Klaida"
+
+#, python-format
+#~ msgid "No Analytic Journal !"
+#~ msgstr "Nėra analitinio žurnalo !"
+
+#, python-format
+#~ msgid "You have to provide an account for the write off entry !"
+#~ msgstr "Jūs turite nurodyti sąskaitą nurašymo įrašui"
+
+#, python-format
+#~ msgid "You can not delete posted movement: \"%s\"!"
+#~ msgstr "Jūs negalite ištrinti patvirtintų įrašų: \"%s\"!"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "Nenurodytas analitinis žurnalas !"
+
+#, python-format
+#~ msgid "No period found !"
+#~ msgstr "Nesukurtas periodas !"
+
+#, python-format
+#~ msgid "You can not use this general account in this journal !"
+#~ msgstr "Jūs negalite naudoti suminės sąskaitos šiame žurnale !"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a reconciled entry ! Please note that "
+#~ "you can just change some non important fields !"
+#~ msgstr ""
+#~ "Jūs negalite atlikti pakeitimų sugretintame įraše ! Leidžiami keisti tik "
+#~ "nesvarbūs laukeliai !"
+
+#, python-format
+#~ msgid "You can not add/modify entries in a closed journal."
+#~ msgstr "Jūs negalite pridėti/keisti įrašų uždarytame žurnale."
+
+#, python-format
+#~ msgid "No Data Available"
+#~ msgstr "Nėra duomenų"
+
+#, python-format
+#~ msgid "You must select accounts to reconcile"
+#~ msgstr "Jūs turite pasirinkti sąskaitas sugretinimui"
+
+#, python-format
+#~ msgid ""
+#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
+#~ msgstr "Tikėtinas balansas (%.2f) skirtingas nuo apskaičiuotojo. (%.2f)"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a confirmed entry ! Please note that you "
+#~ "can just change some non important fields !"
+#~ msgstr ""
+#~ "Jūs negalite atlikti pakeitimų patvirtintame įraše ! Leidžiami keisti tik "
+#~ "nesvarbūs laukeliai !"
+
+#, python-format
+#~ msgid "Cannot create invoice move on centralised journal"
+#~ msgstr ""
+#~ "Negalima sukurti sąskaitos faktūros panaudojant centralizuotą žurnalą."
+
+#, python-format
+#~ msgid "Purchase Journal"
+#~ msgstr "Pirkimo žurnalas"
+
+#, python-format
+#~ msgid "Free Reference"
+#~ msgstr "Nuoroda"
+
+#, python-format
+#~ msgid "No Partner Defined !"
+#~ msgstr "Nėra nurodyta kontrahento !"
+
+#, python-format
+#~ msgid "Entries are not of the same account or already reconciled ! "
+#~ msgstr "Įrašai nėra tos pačios sąskaitos arba jau sugretinti ! "
+
+#, python-format
+#~ msgid "Cannot delete invoice(s) that are already opened or paid !"
+#~ msgstr ""
+#~ "Negalima trinti sąskaitų faktūrų, kurios yra atidarytos arba apmokėtos !"
+
+#, python-format
+#~ msgid "No sequence defined in the journal !"
+#~ msgstr "Nėra nurodytos sekos šiam žurnalui"
+
+#, python-format
+#~ msgid "Unable to find a valid period !"
+#~ msgstr "Negalima rasti galiojančio periodo !"
+
+#, python-format
+#~ msgid "Your journal must have a default credit and debit account."
+#~ msgstr "Jūsų žurnalas privalo turėti numatytąją kredito ir debeto sąskaitas."
+
+#, python-format
+#~ msgid "The journal must have default credit and debit account"
+#~ msgstr ""
+#~ "Šis žurnalas privalo turėti numatytąsias kreditinę ir debetinę sąskaitą"
+
+#, python-format
+#~ msgid "Some entries are already reconciled !"
+#~ msgstr "Kai kurie įrašai jau yra sugretinti !"
+
+#, python-format
+#~ msgid "Already Reconciled"
+#~ msgstr "Jau sugretinta"
+
+#, python-format
+#~ msgid "Unable to change tax !"
+#~ msgstr "Negalima pakeisti mokesčio !"
+
+#, python-format
+#~ msgid ""
+#~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+#~ "defined !"
+#~ msgstr ""
+#~ "Tiekėjo mokėjimo terminas neturi apibrėžtų mokėjimo termino eilučių !"
+
+#, python-format
+#~ msgid "The account entries lines are not in valid state."
+#~ msgstr "Sąskaitos įrašai yra netinkamos būsenos."
+
+#, python-format
+#~ msgid "No records found for your selection!"
+#~ msgstr "Nerasta nei vieno įrašo pagal Jūsų filtrus!"
+
+#, python-format
+#~ msgid "Unable to reconcile entry \"%s\": %.2f"
+#~ msgstr "Neįmanoma panaikinti sugretinimo šiam įrašui \"%s\": %.2f"
+
+#, python-format
+#~ msgid "Please set an analytic journal on this financial journal !"
+#~ msgstr "Prašome nustatyti analitinį žurnalą šiame finansiniame žurnale."
+
+#, python-format
+#~ msgid "Date to must be set between %s and %s"
+#~ msgstr "Data turi būti tarp %s ir  %s"
+
+#, python-format
+#~ msgid "Invoice is already reconciled"
+#~ msgstr "Sąskaita faktūra jau yra sugretinta."
+
+#, python-format
+#~ msgid "Couldn't create move between different companies"
+#~ msgstr "Negalima sukurti DK įrašų skirtingoms įmonėms"
+
+#, python-format
+#~ msgid "Entry \"%s\" is not valid !"
+#~ msgstr "Įrašas \"%s\" yra nepatvirtintas !"
+
+#, python-format
+#~ msgid "Global taxes defined, but are not in invoice lines !"
+#~ msgstr "Sąskaitos faktūros eilutėse nėra nurodyta mokesčių !"
+
+#, python-format
+#~ msgid "Bad total !"
+#~ msgstr "Bloga suma !"
+
+#, python-format
+#~ msgid "The journal must have centralised counterpart"
+#~ msgstr "Šis žurnalas privalo automatiškai kurti balansą."
+
+#, python-format
+#~ msgid "End of Fiscal Year Entry"
+#~ msgstr "Fiskalinių metų pabaigos įrašai"
+
+#, python-format
+#~ msgid "Data Insufficient !"
+#~ msgstr "Nepakankami duomenys !"
+
+#, python-format
+#~ msgid "Can not pay draft/proforma/cancel invoice."
+#~ msgstr ""
+#~ "Negalima apmokėti sąskaitos faktūros juodraščio, proforma ir atšauktos "
+#~ "būsenos."
+
+#, python-format
+#~ msgid "Date not in a defined fiscal year"
+#~ msgstr "Data nepatenka į pasirinktus fiskalinius metus."
+
+#, python-format
+#~ msgid "Please verify that an account is defined in the journal."
+#~ msgstr "Prašome patikrinti ar šiam žurnalui nurodytos sąskaitos."
+
+#, python-format
+#~ msgid "You can not use an inactive account!"
+#~ msgstr "Negalite naudoti neaktyvios sąskaitos!"
+
+#, python-format
+#~ msgid "Entry is already reconciled"
+#~ msgstr "Įrašas jau yra sugretintas"
+
+#, python-format
+#~ msgid ""
+#~ "Selected Move lines does not have any account move enties in draft state"
+#~ msgstr "Pasirinkti didžiosios knygos įrašai nėra juodraščio būsenos"
+
+#, python-format
+#~ msgid "This period is already closed !"
+#~ msgstr "Šis periodas jau yra uždarytas !"
+
+#, python-format
+#~ msgid "You must define an analytic journal of type '%s' !"
+#~ msgstr "Jūs turite pasirinkti analitinio žurnalo tipą  '%s' !"
+
+#, python-format
+#~ msgid "Bad account!"
+#~ msgstr "Netinkama sąskaita !"
+
+#, python-format
+#~ msgid "Standard Encoding"
+#~ msgstr "Standartiniai įrašai"
+
+#, python-format
+#~ msgid "Closing of fiscal year cancelled, please check the box !"
+#~ msgstr ""
+#~ "Fiskalinių metų uždarymas buvo atšauktas, prašome pažymėti šį laukelį !"
+
+#, python-format
+#~ msgid "Taxes missing !"
+#~ msgstr "Mokesčiai praleisti !"
+
+#, python-format
+#~ msgid "No piece number !"
+#~ msgstr "Nenurodytas numeris !"
+
+#, python-format
+#~ msgid "Closing of states cancelled, please check the box !"
+#~ msgstr "Būsena uždaryta yra atšaukta, prašome pažymėti šį laukelį !"
+
+#, python-format
+#~ msgid "You have to define an analytic journal on the '%s' journal!"
+#~ msgstr "Jūs turite pasirinkti analitinį žurnalą '%s' žurnale!"
+
+#, python-format
+#~ msgid "You must enter a period length that cannot be 0 or below !"
+#~ msgstr ""
+#~ "Turite įvesti periodo trukmę, kuri negali būti lygi 0 ar būti neigiama."
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Įspėjimas!"
+
+#, python-format
+#~ msgid "Entries: "
+#~ msgstr "Įrašai: "
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 4215e4cd316..383d1bc281f 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* account
+#	* account
 #
 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"
-"PO-Revision-Date: 2009-12-16 15:57+0000\n"
+"PO-Revision-Date: 2010-07-19 13:33+0000\n"
 "Last-Translator: Pieter J. Kersten (EduSense BV) <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-06-22 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -93,7 +93,8 @@ msgid "Unreconciled entries"
 msgstr "Niet afgeletterde boekingen"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Basiscode"
@@ -125,7 +126,8 @@ msgid "Residual"
 msgstr "Resterend"
 
 #. module: account
-#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -190,8 +192,8 @@ msgid "Move line select"
 msgstr "Veplaats geselecteerde regel"
 
 #. module: account
-#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0
+#: rml:account.tax.code.entries:0
 msgid "Entry label"
 msgstr "Boekingskenmerk"
 
@@ -206,12 +208,14 @@ msgid "Period Sum"
 msgstr "Periodiek bedrag"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Bereken code (if type=code)"
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Boekingsregel"
 
@@ -228,10 +232,12 @@ msgstr "Periodieke boekingen"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
-#: field:account.invoice.tax,amount:0 field:account.move,amount:0
-#: field:account.tax,amount:0 field:account.tax.template,amount:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.reconcile.line,amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: field:account.move,amount:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
 msgid "Amount"
 msgstr "Bedrag"
 
@@ -271,7 +277,8 @@ msgstr ""
 "weergave aanmaken voor een snellere codering in elk dagboek."
 
 #. module: account
-#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -285,19 +292,20 @@ msgstr ""
 "vervaldata berekenen, bijvoorbeeld 50% nu en 50% over een maand."
 
 #. module: account
-#: selection:account.tax,type:0 selection:account.tax.template,type:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Vastgezet"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
 msgid "Overdue Payments"
 msgstr "Betalingsherinnering"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -306,7 +314,8 @@ msgid "Select period"
 msgstr "Selecteer periode"
 
 #. module: account
-#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Brondocument"
 
@@ -336,10 +345,12 @@ msgid "Delta Debit"
 msgstr "Richting debet"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice,amount_tax:0
+#: model:account.account.type,name:account.account_type_tax
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "Belastingen"
+msgstr "Belasting"
 
 #. module: account
 #: rml:account.general.journal:0
@@ -349,18 +360,22 @@ msgstr "Debetboekingen"
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Kostenplaatsen"
 
 #. module: account
-#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Belasting over onderliggende"
 
 #. module: account
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Naam dagboek"
@@ -428,8 +443,11 @@ msgid "Contra"
 msgstr "Tegenover"
 
 #. module: account
-#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
-#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
+#: field:account.analytic.account,state:0
+#: field:account.bank.statement,state:0
+#: field:account.invoice,state:0
+#: view:account.move:0
+#: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Status"
@@ -441,7 +459,8 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Niet-betaalde credit inkoopfacturen"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Special bewerking"
 
@@ -463,8 +482,10 @@ msgid "Disc.(%)"
 msgstr "Korting. (%)"
 
 #. module: account
-#: rml:account.general.ledger:0 field:account.model,ref:0
-#: field:account.move,ref:0 rml:account.overdue:0
+#: rml:account.general.ledger:0
+#: field:account.model,ref:0
+#: field:account.move,ref:0
+#: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ref"
@@ -661,9 +682,13 @@ msgid "Sub-Total :"
 msgstr "Subtotaal:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0
+#: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Kostenplaatsboekingen"
 
@@ -678,6 +703,7 @@ msgid "Associated Partner"
 msgstr "Gekoppelde relatie"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Aanvullende informatie"
@@ -693,7 +719,8 @@ msgid "Select the Period for Analysis"
 msgstr "Kies de analyseperiode"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -725,7 +752,8 @@ msgid "Field Name"
 msgstr "Veldnaam"
 
 #. module: account
-#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0
+#: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Kenmerk bovenliggende"
 
@@ -735,7 +763,8 @@ msgid "End of Year Entries Journal"
 msgstr "Jaarafsluiting dagboek"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Purchase Properties"
 msgstr "Inkoopeigenschappen"
 
@@ -755,9 +784,12 @@ msgid "Move Lines Created."
 msgstr "Boekingen aangemaakt"
 
 #. module: account
-#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
-#: field:account.move,state:0 field:account.move.line,state:0
-#: field:account.period,state:0 field:account.subscription,state:0
+#: field:account.fiscalyear,state:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: field:account.subscription,state:0
 msgid "Status"
 msgstr "Status"
 
@@ -914,8 +946,10 @@ msgstr "Selecteer grootboekschema"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
-#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Aantal"
@@ -958,13 +992,16 @@ msgstr "Kostenplaats factuur"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0 rml:account.general.journal:0
+#: view:account.fiscalyear:0
+#: rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0 field:account.move,period_id:0
+#: field:account.journal.period,period_id:0
+#: field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0
+#: view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -986,7 +1023,8 @@ msgid "Net Total:"
 msgstr "Netto totaal"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1110,7 +1148,8 @@ msgid "Fiscal Position Templates"
 msgstr "Fiscale situatie sjablonen"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Eenheidsprijs"
 
@@ -1268,7 +1307,8 @@ msgid "Not reconciled transactions"
 msgstr "Niet afgeletterde transacties"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Vervangingstabel belasting"
@@ -1290,7 +1330,8 @@ msgid "Write-Off account"
 msgstr "Grootboekkaart afboekingen"
 
 #. module: account
-#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0
+#: field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Model"
 
@@ -1316,9 +1357,11 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Selecteer facturen welke u wilt betalen."
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0
+#: field:account.journal,view_id:0
 msgid "View"
 msgstr "Aanzicht"
 
@@ -1389,7 +1432,8 @@ msgstr "Categoriën grootboekrekeningen"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1405,7 +1449,8 @@ msgid "Journal"
 msgstr "Dagboek"
 
 #. module: account
-#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0
+#: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Subrekeningen"
 
@@ -1431,7 +1476,8 @@ msgid "Statement reconcile line"
 msgstr "Afschrift verrekeningsregel"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Laat leeg om de inkomsten rekening te gebruiken"
 
@@ -1440,6 +1486,9 @@ msgstr "Laat leeg om de inkomsten rekening te gebruiken"
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr "Boek af"
 
@@ -1560,7 +1609,8 @@ msgid "Account n°"
 msgstr "Rekening n°"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Laat leeg om de uitgaven grootboekkaart te gebruiken"
 
@@ -1570,7 +1620,8 @@ msgid "Account to reconcile"
 msgstr "Af te letteren grootboekkaart"
 
 #. module: account
-#: rml:account.invoice:0 field:account.model.line,partner_id:0
+#: rml:account.invoice:0
+#: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Relatie ref."
@@ -1582,12 +1633,14 @@ msgid "Receivable and Payable Accounts"
 msgstr "\"Te ontvangen\" en \"Te betalen\" rekeningen"
 
 #. module: account
-#: view:account.subscription:0 field:account.subscription,lines_id:0
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Verdeelregels"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1752,7 +1805,8 @@ msgid "Period length (days)"
 msgstr "Duur periode (dagen)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procent"
@@ -1763,7 +1817,8 @@ msgid "Charts"
 msgstr "Rekeningschema's"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1838,9 +1893,11 @@ msgstr "Uitgaven credit nota's dagboek"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
-#: field:account.journal,type:0 field:account.move,type:0
-#: field:account.move.reconcile,type:0 xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: field:account.journal,type:0
+#: field:account.move,type:0
+#: field:account.move.reconcile,type:0
 msgid "Type"
 msgstr "Type"
 
@@ -1954,7 +2011,7 @@ msgstr "Printdatum"
 #. module: account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+msgstr "Ongeldige XML voor weergave!"
 
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
@@ -1988,7 +2045,8 @@ msgid "Journal-Period Name"
 msgstr "Naam dagboekperiode"
 
 #. module: account
-#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Naam belasting"
 
@@ -2006,7 +2064,8 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2081,8 +2140,10 @@ msgstr "Voorgaande"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
-#: field:account.journal,currency:0 field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.journal,currency:0
+#: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Valuta"
@@ -2120,7 +2181,8 @@ msgid "Analytic Entry"
 msgstr "Kostenplaatsboeking"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Aanmaningsbericht"
 
@@ -2172,7 +2234,8 @@ msgid "Detail"
 msgstr "Detail"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Consolidatie"
 
@@ -2269,17 +2332,22 @@ msgid "The account basis of the tax declaration."
 msgstr "De grootboekrekening van de belastingverklaring"
 
 #. module: account
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0
+#: rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0 field:account.move,date:0
+#: rml:account.journal.period.print:0
+#: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
+#: field:account.subscription.line,date:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Date"
 msgstr "Datum"
 
@@ -2295,7 +2363,8 @@ msgid "Unreconcile"
 msgstr "Maak afletteren ongedaan"
 
 #. module: account
-#: field:account.tax,type:0 field:account.tax.template,type:0
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Soort belasting"
 
@@ -2305,7 +2374,8 @@ msgid "Statement Entries"
 msgstr "Afschrift mutaties"
 
 #. module: account
-#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0
+#: field:account.journal,user_id:0
 msgid "User"
 msgstr "Gebruiker"
 
@@ -2395,15 +2465,18 @@ msgid "Date End"
 msgstr "Einddatum"
 
 #. module: account
-#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0
+#: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
 msgstr "Mutatie regels"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Van Toepassing zijnde Code (IF type=code)"
 
@@ -2492,9 +2565,11 @@ msgstr "Van analytische rekeningen, Maak factuur."
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0
+#: wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0
+#: view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2513,7 +2588,8 @@ msgstr "Van analytische rekeningen, Maak factuur."
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Annuleer"
 
@@ -2523,8 +2599,10 @@ msgid "Acc. Type Name"
 msgstr "Rekeningsoortnaam"
 
 #. module: account
-#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2538,7 +2616,8 @@ msgid "Litigation"
 msgstr "Betwist"
 
 #. module: account
-#: view:account.move.line:0 wizard_view:account.move.validate,init:0
+#: view:account.move.line:0
+#: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Informatie"
@@ -2582,6 +2661,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2655,7 +2736,8 @@ msgid "Price"
 msgstr "Prijs"
 
 #. module: account
-#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2690,6 +2772,7 @@ msgid "Invoice Number"
 msgstr "Factuurnummer"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr "Einde van periode"
@@ -2722,13 +2805,17 @@ msgid "Invoice Reference"
 msgstr "Factuurreferentie"
 
 #. module: account
-#: field:account.account,name:0 field:account.account.template,name:0
+#: field:account.account,name:0
+#: field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0 field:account.config.wizard,name:0
-#: field:account.model.line,name:0 field:account.move,name:0
-#: field:account.move.line,name:0 field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0
+#: field:account.config.wizard,name:0
+#: field:account.model.line,name:0
+#: field:account.move,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Naam"
@@ -2771,7 +2858,8 @@ msgstr ""
 "belastingen. In dat geval bepaalt het de volgorde van berekeningen."
 
 #. module: account
-#: field:account.journal.column,view_id:0 view:account.journal.view:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2864,11 +2952,14 @@ msgid "Full Account Name"
 msgstr "Volledige naam rekening"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2889,7 +2980,9 @@ msgid "Document: Customer account statement"
 msgstr "Document: Boekhoudkundige klantverklaring"
 
 #. module: account
-#: view:product.product:0 view:product.template:0 view:res.partner:0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
 msgid "Accounting"
 msgstr "Financiële verwerking"
 
@@ -2922,9 +3015,11 @@ msgstr "Boekingsregels"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr "Aflettering"
 
@@ -2934,8 +3029,10 @@ msgid "Centralisation"
 msgstr "Centralisatie"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
-#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax,tax_code_id:0
+#: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Belastingpercentage"
@@ -2978,12 +3075,13 @@ msgstr ""
 "relatie."
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situatie"
 
 #. module: account
-#: rml:account.invoice:0 xsl:account.transfer:0
+#: rml:account.invoice:0
 msgid "Document"
 msgstr "Document"
 
@@ -3023,7 +3121,8 @@ msgid "Cancel selected invoices"
 msgstr "Annuleer de geselecteerde facturen"
 
 #. module: account
-#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3032,6 +3131,8 @@ msgstr "Kostenplaats dagboek"
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr "Boekingslabel"
 
@@ -3046,23 +3147,28 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Naar Concept"
 
 #. module: account
-#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Referentie naar document welke ten grondslag ligt aan de factuur."
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Passiva"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.tax,base:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Basisbedrag"
 
@@ -3072,7 +3178,8 @@ msgid "Model Name"
 msgstr "Transactienaam"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Others"
 msgstr "Andere"
 
@@ -3082,20 +3189,23 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0 view:account.move:0
+#: view:account.invoice:0
+#: view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Bevestig"
 
 #. module: account
-#: view:account.model:0 field:account.model,legend:0
+#: view:account.model:0
+#: field:account.model,legend:0
 msgid "Legend"
 msgstr "Legenda"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 msgid "Proposed invoice to be checked, validated and printed"
-msgstr "Voorgestelde factuur wordt gecontroleerd, akkoord gegeven en geprint."
+msgstr ""
+"Voorgestelde factuur wordt gecontroleerd, akkoord gegeven en geprint."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_select
@@ -3103,14 +3213,17 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0 rml:account.account.balance:0
+#: view:account.account:0
+#: rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0
+#: field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3131,9 +3244,12 @@ msgid "By Date and Period"
 msgstr "Op datum en periode"
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0 view:account.invoice.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Notities"
@@ -3148,7 +3264,8 @@ msgstr ""
 "afgeletterd met de boekingen van de betalingen."
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3173,15 +3290,21 @@ msgid "Statement encoding produces payment entries"
 msgstr "Afschrift verwerking maakt betaalingsmutaties aan"
 
 #. module: account
-#: field:account.account,code:0 rml:account.account.balance:0
-#: field:account.account.template,code:0 field:account.account.type,code:0
+#: field:account.account,code:0
+#: rml:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
-#: rml:account.general.journal:0 field:account.journal,code:0
-#: rml:account.partner.balance:0 field:account.period,code:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0
+#: field:account.fiscalyear,code:0
+#: rml:account.general.journal:0
+#: field:account.journal,code:0
+#: rml:account.partner.balance:0
+#: field:account.period,code:0
 msgid "Code"
 msgstr "Code"
 
@@ -3191,7 +3314,8 @@ msgid "Financial Management"
 msgstr "Financiële administratie"
 
 #. module: account
-#: selection:account.account.type,close_method:0 selection:account.tax,type:0
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Geen"
@@ -3203,6 +3327,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr "Genereer boekjaar openingsbalans"
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr "Letter boekingen af"
@@ -3218,7 +3343,8 @@ msgid "Additionnal Information"
 msgstr "Extra Informatie"
 
 #. module: account
-#: field:account.tax,name:0 field:account.tax.template,name:0
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Toeslagnaam"
@@ -3295,7 +3421,8 @@ msgid "Partner Balance"
 msgstr "Ouderdomsanalyse per relatie"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Relatie administratie"
 
@@ -3310,7 +3437,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3350,7 +3478,8 @@ msgid "Import invoice"
 msgstr "Importeer factuur"
 
 #. module: account
-#: view:account.invoice:0 view:wizard.company.setup:0
+#: view:account.invoice:0
+#: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Aanmaken"
@@ -3366,7 +3495,8 @@ msgid "Invoice line"
 msgstr "Factuurregel"
 
 #. module: account
-#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Afkorting"
 
@@ -3395,13 +3525,15 @@ msgstr ""
 "valuta boeking is."
 
 #. module: account
-#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Bovenliggende belastingkaart"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0 view:account.account.type:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3437,7 +3569,8 @@ msgid "Central Journal"
 msgstr "Centraal dagboek"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Voortgebracht saldo"
 
@@ -3513,7 +3646,8 @@ msgid "Journal code"
 msgstr "Dagboekcode"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0
+#: view:account.model:0
 msgid "Create entries"
 msgstr "Creëer boekingen"
 
@@ -3552,7 +3686,6 @@ msgstr ""
 "voor de huidige relatie"
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr "Mutatienaam"
@@ -3573,11 +3706,14 @@ msgstr ""
 "facturen wilt."
 
 #. module: account
-#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Reeks"
@@ -3645,7 +3781,8 @@ msgstr "Grootboekkaart verdeling"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0 rml:account.overdue:0
+#: field:account.move.line,date_maturity:0
+#: rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Vervaldatum"
 
@@ -3665,7 +3802,8 @@ msgid "Account Configure Wizard "
 msgstr "Administratie configuratie assistent "
 
 #. module: account
-#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Startdatum"
@@ -3703,7 +3841,8 @@ msgid "Unreconciled"
 msgstr "Unreconciled"
 
 #. module: account
-#: field:account.account,note:0 field:account.account.template,note:0
+#: field:account.account,note:0
+#: field:account.account.template,note:0
 msgid "Note"
 msgstr "Notitie"
 
@@ -3736,7 +3875,8 @@ msgid "Entry Sequence"
 msgstr "Boekstukreeks"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Afgesloten"
 
@@ -3866,9 +4006,12 @@ msgid "Code/Date"
 msgstr "Code/Datum"
 
 #. module: account
-#: field:account.account,active:0 field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0 field:account.journal,active:0
-#: field:account.journal.period,active:0 field:account.payment.term,active:0
+#: field:account.account,active:0
+#: field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Actief"
@@ -3920,15 +4063,20 @@ msgid "Secondary Currency"
 msgstr "Valuta"
 
 #. module: account
-#: field:account.account,credit:0 rml:account.account.balance:0
+#: field:account.account,credit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.journal.period.print:0
-#: field:account.model.line,credit:0 field:account.move.line,credit:0
-#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3962,7 +4110,8 @@ msgid "Account Move"
 msgstr "Transactie"
 
 #. module: account
-#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Mutatieregels"
 
@@ -4059,15 +4208,18 @@ msgid "Journal Column"
 msgstr "Dagboekkolom"
 
 #. module: account
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Verwerkt"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0 view:account.fiscalyear:0
+#: field:account.config.wizard,period:0
+#: view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4080,7 +4232,8 @@ msgid "Periods"
 msgstr "Periodes"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4104,10 +4257,12 @@ msgstr "Zoek boekingen"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr "Analytische kosten voor herfacturering van inkopen, tijdschema's, ..."
+msgstr ""
+"Analytische kosten voor herfacturering van inkopen, tijdschema's, ..."
 
 #. module: account
-#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Standaard belastingen"
 
@@ -4116,7 +4271,7 @@ msgstr "Standaard belastingen"
 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 !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: account
 #: help:account.account.type,sign:0
@@ -4166,7 +4321,8 @@ msgstr "Soort controls"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Rekeningnaam"
 
@@ -4257,7 +4413,8 @@ msgid "Import file from your bank statement"
 msgstr "Importbestand voor uw bankafschriften"
 
 #. module: account
-#: field:account.account,type:0 field:account.account.template,type:0
+#: field:account.account,type:0
+#: field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Interne soort"
 
@@ -4283,12 +4440,14 @@ msgid "Posted"
 msgstr "Verstuurd"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Creditfacturen"
 
 #. module: account
-#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0
+#: field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Einddatum"
 
@@ -4309,7 +4468,8 @@ msgid "Day of the Month"
 msgstr "Dag van de maand"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Regels"
 
@@ -4330,7 +4490,8 @@ msgstr ""
 "belastingen. In dat geval bepaalt het de volgorde van berekening."
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Belastingaangifte"
 
@@ -4390,12 +4551,14 @@ msgid "The optional quantity on entries"
 msgstr "De optionele hoeveelheid in boekingen"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JNRL"
 
 #. module: account
-#: view:account.fiscalyear:0 view:account.period:0
+#: view:account.fiscalyear:0
+#: view:account.period:0
 msgid "States"
 msgstr "Provincies"
 
@@ -4431,7 +4594,8 @@ msgstr "Begindatum"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Totaal"
 
@@ -4550,9 +4714,11 @@ msgstr "Geldige boekingen van de factuur"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0 field:account.journal,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4649,9 +4815,12 @@ msgid "Print Aged Trial Balance"
 msgstr "Druk ouderdomsanalyse af"
 
 #. module: account
-#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0 field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0
+#: field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Ref."
 
@@ -4731,7 +4900,8 @@ msgid "Control Invoice"
 msgstr "Beheer factuur"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Te ontvangen"
@@ -4758,7 +4928,8 @@ msgstr "BTW:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Totaal:"
@@ -4769,7 +4940,8 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Vervangingstabel grootboekrekeningen"
@@ -4785,7 +4957,8 @@ msgid "Account Reconciliation"
 msgstr "Account Reconciliation"
 
 #. module: account
-#: view:account.bank.statement:0 selection:account.bank.statement,state:0
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Bevestig"
 
@@ -4800,7 +4973,8 @@ msgid "Parent Account Template"
 msgstr "Bovenliggerde grootboekkaart template"
 
 #. module: account
-#: help:account.tax,domain:0 help:account.tax.template,domain:0
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4821,7 +4995,8 @@ msgid "Analytic account"
 msgstr "Kostenplaatsen"
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Inkoopfactuur"
 
@@ -4831,16 +5006,22 @@ msgid "Valid"
 msgstr "Geldig"
 
 #. module: account
-#: field:account.account,debit:0 rml:account.account.balance:0
+#: field:account.account,debit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 field:account.model.line,debit:0
-#: field:account.move.line,debit:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.central.journal:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Debet"
@@ -4861,6 +5042,7 @@ msgid "Invoice Lines"
 msgstr "Factuurregels"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr "Begin van de periode"
@@ -4902,7 +5084,8 @@ msgid "Reporting"
 msgstr "Rapportering"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -4933,7 +5116,8 @@ msgid "Configuration"
 msgstr "Instellingen"
 
 #. module: account
-#: view:account.analytic.line:0 view:account.invoice:0
+#: view:account.analytic.line:0
+#: view:account.invoice:0
 msgid "Total amount"
 msgstr "Totaalbedrag"
 
@@ -4985,12 +5169,14 @@ msgid "Paid invoice"
 msgstr "Betaalde factuur"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Belasting instellingen"
 
 #. module: account
-#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0
+#: field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Belastinggroep"
 
@@ -5033,7 +5219,8 @@ msgid "With movements"
 msgstr "Met mutaties"
 
 #. module: account
-#: field:account.tax,domain:0 field:account.tax.template,domain:0
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domein"
 
@@ -5058,7 +5245,9 @@ msgid "Manually"
 msgstr "Handmatig"
 
 #. module: account
-#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5075,7 +5264,8 @@ msgid "Payable Accounts"
 msgstr "Crediteuren"
 
 #. module: account
-#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Factuurregel"
 
@@ -5126,7 +5316,8 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "De optionele andere valuta als het een multi-valuta boeking is."
 
 #. module: account
-#: view:account.invoice:0 field:account.invoice,payment_ids:0
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Betalingen"
@@ -5172,9 +5363,12 @@ msgstr "Kies dagboek en betaaldatum"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.move,state:0
-#: selection:account.move.line,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.move,state:0
+#: selection:account.move.line,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Concept"
@@ -5201,7 +5395,8 @@ msgid "Are you sure ?"
 msgstr "Weet u het zeker ?"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PROFORMA"
 
@@ -5237,16 +5432,20 @@ msgid "Supplier Invoice Process"
 msgstr "Inkoopfactuur afhandelen"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Pagina"
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Optional Information"
 msgstr "Optionele informatie"
 
@@ -5262,7 +5461,8 @@ msgid "Receivable and Payable"
 msgstr "Te betalen en te ontvangen"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.general.journal:0
+#: rml:account.account.balance:0
+#: rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5288,7 +5488,8 @@ msgstr ""
 "is, dan zal het veld de grondslag voor belasting bevatten (zonder belasting)."
 
 #. module: account
-#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Bereken"
@@ -5296,7 +5497,8 @@ msgstr "Bereken"
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr "De inkomsten of uitgaven rekening gerelateerd aan het gekozen produkt."
+msgstr ""
+"De inkomsten of uitgaven rekening gerelateerd aan het gekozen produkt."
 
 #. module: account
 #: field:account.tax,type_tax_use:0
@@ -5322,7 +5524,6 @@ msgstr "Aantal periodes"
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5332,7 +5533,8 @@ msgid "End of period"
 msgstr "Einde van periode"
 
 #. module: account
-#: view:account.move:0 model:ir.model,name:account.model_account_move
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Boeking"
 
@@ -5343,7 +5545,8 @@ msgid "General Journal"
 msgstr "Algemeen dagboek"
 
 #. module: account
-#: field:account.account,balance:0 rml:account.account.balance:0
+#: field:account.account,balance:0
+#: rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5351,9 +5554,12 @@ msgstr "Algemeen dagboek"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0 field:account.move.line,balance:0
-#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0 rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: rml:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Saldo"
@@ -5399,8 +5605,11 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "De gebruikte reeks voor factuurnummering in dit dagboek"
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.journal:0 view:account.move:0 view:account.move.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "General Information"
 msgstr "Algemene informatie"
 
@@ -5442,7 +5651,8 @@ msgid "List of Accounts"
 msgstr "Lijst grootboekrekeningen"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Sales Properties"
 msgstr "Verkoopinstellingen"
 
@@ -5507,7 +5717,6 @@ msgstr "Boekjaar dat wordt afgesloten"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5535,11 +5744,15 @@ msgstr "IntraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
-#: field:account.invoice,name:0 field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0
+#: rml:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0 field:account.payment.term,note:0
-#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
+#: rml:account.overdue:0
+#: field:account.payment.term,note:0
+#: field:account.tax.code,info:0
+#: field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -5587,7 +5800,8 @@ msgstr ""
 "crediteurenrekening van de huidige relatie."
 
 #. module: account
-#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Code"
 
@@ -5669,7 +5883,8 @@ msgstr "Model definities"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Cash"
 msgstr "Contanten"
 
@@ -5709,7 +5924,8 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Laat leeg voor alle open boekjaren"
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Credit inkoopfactuur"
 
@@ -5758,8 +5974,10 @@ msgstr ""
 "voor de huidige productcategorie."
 
 #. module: account
-#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5793,8 +6011,10 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Naam van boekjaar welke wordt laten zien op scherm"
 
 #. module: account
-#: field:account.invoice,payment_term:0 view:account.payment.term:0
-#: field:account.payment.term,name:0 view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5853,7 +6073,8 @@ msgstr "Ja"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid "Check this if the user is allowed to reconcile entries in this account."
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Vink dit aan als het de gebruiker is toegestaan om posten op deze rekening "
 "af te letteren."
@@ -5880,7 +6101,8 @@ msgid "Accounting Dashboard"
 msgstr "Financieel dashboard"
 
 #. module: account
-#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
 msgstr "Te factureren rekeningen"
 
@@ -5939,18 +6161,18 @@ msgstr "Keuze gebaseerd op"
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr "Melding"
+msgstr "Mededeling"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr "Periode"
+msgstr "Boekingsperiode"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr "Rekeningsaldo"
+msgstr "Saldo"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
@@ -5970,7 +6192,7 @@ msgstr "Vergelijk geselecteerde jaren in termen van"
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr "Kies boekjaar/boekjaren (Max 3 jaar)"
+msgstr "Kies boekjaren (max. 3 jaar)"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
@@ -6038,7 +6260,7 @@ msgid "Show Comparision in %"
 msgstr "Toon vergelijking in %"
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
 msgstr "Kies periode"
 
@@ -6060,7 +6282,7 @@ msgstr "Toon rekeningen"
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "1. You have selected more than 3 years in any case."
-msgstr "1. U heeft meer dan 3 boekjaren gekozen"
+msgstr "1. U hebt meer dan 3 boekjaren geselecteerd"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -6076,7 +6298,7 @@ msgstr "Jaar :"
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You can select maximum 3 years. Please check again."
-msgstr "U  kunt maximaal 3 boekjaren kiezen. Probeer opnieuw."
+msgstr "U  kunt maximaal 3 boekjaren selecteren. Probeer opnieuw."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6117,13 +6339,13 @@ msgstr ""
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid ""
-"You may have selected the compare options with more than 1 year with credit/"
-"debit columns and % option.This can lead contents to be printed out of the "
-"paper.Please try again."
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
 msgstr ""
-"Misschien heeft u de vergelijk optie gebruikt met meer dan 1 jaar met credit/"
-"debet kolommen en % optie. Dit kan er toe leiden dat er buiten de marges van "
-"het papier wordt afgedrukt. Probeer het opnieuw."
+"Misschien heeft u de vergelijk optie gebruikt met meer dan 1 jaar met "
+"credit/debet kolommen en % optie. Dit kan er toe leiden dat er buiten de "
+"marges van het papier wordt afgedrukt. Probeer het opnieuw."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
@@ -6141,12 +6363,12 @@ msgid "Month Range"
 msgstr "Binnen een maand"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
 msgstr "Facturen gemaakt binnen de laatste 15 dagen"
 
 #. module: account
-#: model:ir.model,name:account.model_report_invoice_created
+#: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
 msgstr "Overzicht van facturen gemaakt binnen de laatste 15 dagen"
 
@@ -6161,12 +6383,12 @@ msgid "Accounts by type"
 msgstr "Rekeningen per soort"
 
 #. module: account
-#: model:ir.model,name:account.model_report_aged_receivable
+#: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
 msgstr "Te late betalingen tot vandaag"
 
 #. module: account
-#: model:ir.model,name:account.model_report_account_receivable
+#: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
 msgstr "'Te ontvangen' rekeningen"
 
@@ -6176,18 +6398,18 @@ msgid "Range"
 msgstr "Bereik"
 
 #. module: account
-#: model:ir.module.module,description:account.module_meta_information
+#: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
 msgstr "Een module die nieuwe overzichten toevoegt aan de account-module"
 
 #. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
 msgstr "Financiële overzichten - Overzichten"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_receivable_graph
-#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
 msgstr "Saldo per rekeningsoort"
 
@@ -6202,7 +6424,7 @@ msgid "Create Date"
 msgstr "Aanmaakdatum"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
 msgstr "Te late betalers"
@@ -6212,5 +6434,342 @@ msgstr "Te late betalers"
 msgid "Untaxed Amount"
 msgstr "Onbelast bedrag"
 
+#, python-format
+#~ msgid "Account move line \"%s\" is not valid"
+#~ msgstr "Boekingsregel \"%s\" is ongeldig"
+
+#, python-format
+#~ msgid "You have to provide an account for the write off entry !"
+#~ msgstr "Voeg grootboekkaart toe om afboeking naar toe te schrijven!"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Waarschuwing!"
+
+#, python-format
+#~ msgid "You can not delete posted movement: \"%s\"!"
+#~ msgstr "Een definitieve boeking kan niet worden verwijderd; \"%s\"!"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "Geen kostenplaatsdagboek!"
+
+#, python-format
+#~ msgid "Bank Journal "
+#~ msgstr "Bank dagboek "
+
+#, python-format
+#~ msgid "You can not use this general account in this journal !"
+#~ msgstr "Deze grootboekkaart kan niet worden gebruikt in dit dagboek"
+
+#, python-format
+#~ msgid "You can not add/modify entries in a closed journal."
+#~ msgstr "Er kunnen geen boekingen worden aangepast die zijn afgesloten"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a reconciled entry ! Please note that "
+#~ "you can just change some non important fields !"
+#~ msgstr ""
+#~ "Een afgeletterde boeking kan niet worden aangepast! Alleen enkele niet-"
+#~ "belangrijke velden kunnen worden aangepast!"
+
+#, python-format
+#~ msgid "You must first select a partner !"
+#~ msgstr "Selecteer eerst een relatie"
+
+#, python-format
+#~ msgid "The opening journal must not have any entry in the new fiscal year !"
+#~ msgstr ""
+#~ "Het openingsdagboek mag geen boekingen in het nieuwe boekjaar hebben!"
+
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
+
+#, python-format
+#~ msgid ""
+#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
+#~ msgstr ""
+#~ "Het verwachte saldo (%.2f) is verschillend van het berekende saldo (%.2f)."
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a confirmed entry ! Please note that you "
+#~ "can just change some non important fields !"
+#~ msgstr ""
+#~ "Bevestigde boekingen kunnen niet worden aangepast! Er kunnen slechts enkele "
+#~ "niet-belangrijke velden worden aangepast."
+
+#, python-format
+#~ msgid "Purchase Journal"
+#~ msgstr "Inkoopdagboek"
+
+#, python-format
+#~ msgid "Free Reference"
+#~ msgstr "Vrije referentie"
+
+#, python-format
+#~ msgid "No Partner Defined !"
+#~ msgstr "Geen relatie gedefinieerd!"
+
+#, python-format
+#~ msgid "Entries are not of the same account or already reconciled ! "
+#~ msgstr "Mutaties zijn niet van dezelfde rekening of zijn al afgeletterd ! "
+
+#, python-format
+#~ msgid "Invalid action !"
+#~ msgstr "Foutieve handeling!"
+
+#, python-format
+#~ msgid "Your journal must have a default credit and debit account."
+#~ msgstr "Uw dagboek heeft een standaard credit en debet rekening nodig."
+
+#, python-format
+#~ msgid "The journal must have default credit and debit account"
+#~ msgstr "Het dagboek heeft een standaard credit en debet rekening nodig"
+
+#, python-format
+#~ msgid "Some entries are already reconciled !"
+#~ msgstr "Enkele mutaties zijn reeds afgeletterd !"
+
+#, python-format
+#~ msgid "No Analytic Journal !"
+#~ msgstr "Geen analytisch dagboek !"
+
+#, python-format
+#~ msgid "Already Reconciled"
+#~ msgstr "Reeds afgeletterd"
+
+#, python-format
+#~ msgid "Unable to reconcile entry \"%s\": %.2f"
+#~ msgstr "Aflettern onmogelijk van mutatie \"%s\": %.2f"
+
+#, python-format
+#~ msgid "Please set an analytic journal on this financial journal !"
+#~ msgstr "Stel een analytisch dagboek in voor dit financieële journaal !"
+
+#, python-format
+#~ msgid "EXJ"
+#~ msgstr "EXJ"
+
+#, python-format
+#~ msgid "Sales Journal"
+#~ msgstr "Verkoopdagboek"
+
+#, python-format
+#~ msgid "You can not modify/delete a journal with entries for this period !"
+#~ msgstr ""
+#~ "U kunt een dagboek met mutaties voor deze periode niet aanpassen/verwijderen"
+
+#, python-format
+#~ msgid "BNK"
+#~ msgstr "BNK"
+
+#, python-format
+#~ msgid "Entries: "
+#~ msgstr "Boekingen: "
+
+#, python-format
+#~ msgid "Couldn't create move between different companies"
+#~ msgstr "Kon niet verplaatsen tussen de twee bedrijven"
+
+#, python-format
+#~ msgid "Entry \"%s\" is not valid !"
+#~ msgstr "Invoer \"%s\" is ongeldig !"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fout !"
+
+#, python-format
+#~ msgid "SAJ"
+#~ msgstr "SAJ"
+
+#, python-format
+#~ msgid "The journal must have centralised counterpart"
+#~ msgstr "Het dagboek dient een vaste tegenboekingsrekening te hebben."
+
+#, python-format
+#~ msgid "Bad total !"
+#~ msgstr "Fout totaal !"
+
+#, python-format
+#~ msgid "End of Fiscal Year Entry"
+#~ msgstr "Einde van boekjaar"
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "Gebruikersfout"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Waarschuwing"
+
+#, python-format
+#~ msgid "Please verify that an account is defined in the journal."
+#~ msgstr "Ga na of er een grootboekkaart is gedefineerd in het dagboek"
+
+#, python-format
+#~ msgid "You can not use an inactive account!"
+#~ msgstr "Een niet-actieve grootboekkaart kan niet worden gebruikt!"
+
+#, python-format
+#~ msgid "Entry is already reconciled"
+#~ msgstr "Boekings is reeds afgeletterd"
+
+#, python-format
+#~ msgid "This period is already closed !"
+#~ msgstr "Deze periode is al gesloten!"
+
+#, python-format
+#~ msgid ""
+#~ "Selected Move lines does not have any account move enties in draft state"
+#~ msgstr "Geselecteerde mutaties hebben geen boekingen in de concept status"
+
+#, python-format
+#~ msgid "Standard Encoding"
+#~ msgstr "Standaard invoer"
+
+#, python-format
+#~ msgid "Bad account!"
+#~ msgstr "Foute rekening !"
+
+#, python-format
+#~ msgid "Closing of fiscal year cancelled, please check the box !"
+#~ msgstr "Afsluiten van boekjaar geannuleerd. Vink het vakje aan a.u.b. !"
+
+#, python-format
+#~ msgid "Bad account !"
+#~ msgstr "Foute rekening !"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Fout"
+
+#, python-format
+#~ msgid "No piece number !"
+#~ msgstr "Geen onderdeelnummer !"
+
+#, python-format
+#~ msgid "Closing of states cancelled, please check the box !"
+#~ msgstr "Sluiten van de statussen geannuleerd, vink het vakje aan a.u.b. !"
+
+#, python-format
+#~ msgid "You have to define an analytic journal on the '%s' journal!"
+#~ msgstr "U moet een een analytisch dagboek definieren op het '%s' dagboek!"
+
+#, python-format
+#~ msgid "No Data Available"
+#~ msgstr "Geen gegevens beschikbaar"
+
+#, python-format
+#~ msgid "Cannot delete invoice(s) that are already opened or paid !"
+#~ msgstr ""
+#~ "Het is niet mogelijk om facturen te verwijderen die al geopend of betaald "
+#~ "zijn !"
+
+#, python-format
+#~ msgid "No Period found on Invoice!"
+#~ msgstr "Geen periode gevonden op de factuur!"
+
+#, python-format
+#~ msgid "You must select accounts to reconcile"
+#~ msgstr "Selecteer af te letteren rekeningen"
+
+#, python-format
+#~ msgid "No records found for your selection!"
+#~ msgstr "Geen records gevonden voor uw keuze!"
+
+#, python-format
+#~ msgid "Can not pay draft/proforma/cancel invoice."
+#~ msgstr ""
+#~ "Het is niet mogelijk een concept/proforma/geannuleerde factuur te betalen"
+
+#, python-format
+#~ msgid "Can not %s draft/proforma/cancel invoice."
+#~ msgstr "Kan niet %s concept/pro-forma/annuleer factuur."
+
+#, python-format
+#~ msgid "Cannot create invoice move on centralised journal"
+#~ msgstr "Kan geen factuur boeken op gecentraliseerd dagboek."
+
+#, python-format
+#~ msgid "Date to must be set between %s and %s"
+#~ msgstr "Datum tot moet tussen %s en %s liggen"
+
+#, python-format
+#~ msgid ""
+#~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+#~ "defined !"
+#~ msgstr ""
+#~ "De betalingstermijn van de leverancier heeft geen betalingstermijn-regels "
+#~ "(berekening) gedefinieerd!"
+
+#, python-format
+#~ msgid "You can not change the tax, you should remove and recreate lines !"
+#~ msgstr ""
+#~ "U kunt de belasting niet wijzigen, u dient de regels te verwijderen en "
+#~ "opnieuw aan te maken!"
+
+#, python-format
+#~ msgid "Global taxes defined, but are not in invoice lines !"
+#~ msgstr "Algemene belasting gedefinieerd, maar niet in de factuurregels!"
+
+#, python-format
+#~ msgid "Date not in a defined fiscal year"
+#~ msgstr "Datum valt niet in enig boekjaar."
+
+#, python-format
+#~ msgid "You must enter a period length that cannot be 0 or below !"
+#~ msgstr "Een periode-lengte kan niet 0 of minder zijn!"
+
+#, python-format
+#~ msgid "You must define an analytic journal of type '%s' !"
+#~ msgstr "U dient een analytisch dagboek van soort '%s' op te geven!"
+
+#, python-format
+#~ msgid "Taxes missing !"
+#~ msgstr "Belastingen ontbreken !"
+
+#, python-format
+#~ msgid "No sequence defined in the journal !"
+#~ msgstr "Geen reeks gedefinieerd voor het dagboek !"
+
+#, python-format
+#~ msgid "Invoice is already reconciled"
+#~ msgstr "Factuur is al afgeletterd"
+
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "Integriteitsfout !"
+
+#, python-format
+#~ msgid "No journal for ending writing has been defined for the fiscal year"
+#~ msgstr ""
+#~ "Geen dagboek voor het maken van sluitposten gedefinieerd voor het boekjaar."
+
+#, python-format
+#~ msgid "No period found !"
+#~ msgstr "Geen periode gevonden!"
+
+#, python-format
+#~ msgid "Unable to change tax !"
+#~ msgstr "Kon belasting niet wijzigen!"
+
+#, python-format
+#~ msgid "Unable to find a valid period !"
+#~ msgstr "Kon geen geldige periode vinden!"
+
+#, python-format
+#~ msgid "The account entries lines are not in valid state."
+#~ msgstr "De transactieregels zijn niet in een geldige status"
+
+#, python-format
+#~ msgid "Data Insufficient !"
+#~ msgstr "Onvoldoende gegevens !"
+
+#, python-format
+#~ msgid ""
+#~ "Specified Journal does not have any account move entries in draft state for "
+#~ "this period"
+#~ msgstr "Dit dagboek heeft geen boekingen in concept status voor deze periode"
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index 61baf65405a..c620cea1669 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* account
+#	* account
 #
 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"
-"PO-Revision-Date: 2010-06-02 08:19+0000\n"
-"Last-Translator: jan@synkronized.be <Unknown>\n"
+"PO-Revision-Date: 2010-07-22 16:28+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-06-22 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-07-23 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -35,17 +35,17 @@ msgstr "Onbetaalde inkoopfacturen"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
-msgstr ""
+msgstr "Boekingen"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Specifieer de boodschap voor het overzicht 'Te late betalingen'"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr ""
+msgstr "Bevestig bankafschrift"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
@@ -60,7 +60,7 @@ msgstr "Ongeldige modelnaam in de actie-definitie."
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "De toepasselijke munteenheid om te boeken in dit journaal"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -73,11 +73,13 @@ msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
 msgstr ""
+"Deze rekening wordt gebruikt voor ontvangen voorraadwaarde van de huidige "
+"productcategorie"
 
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr ""
+msgstr "Laat leeg om de periode van de factuurdatum te gebruiken"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
@@ -90,7 +92,8 @@ msgid "Unreconciled entries"
 msgstr "Niet afgeletterde boekingen"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Basiscode"
@@ -98,41 +101,42 @@ msgstr "Basiscode"
 #. module: account
 #: view:account.account:0
 msgid "Account Statistics"
-msgstr ""
+msgstr "Rekeningstatistieken"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
 #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
 msgid "Print Taxes Report"
-msgstr ""
+msgstr "Btw-aangifte afdrukken"
 
 #. module: account
 #: field:account.account,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Hoofd"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Boekstuk"
 
 #. module: account
 #: field:account.invoice,residual:0
 msgid "Residual"
-msgstr ""
+msgstr "Rest"
 
 #. module: account
-#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Teken basisbedrag"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Afpunten boekingen ongedaan maken"
 
 #. module: account
 #: constraint:account.period:0
@@ -147,17 +151,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_move_line_form
 #: model:ir.ui.menu,name:account.menu_action_move_line_form
 msgid "Entries"
-msgstr ""
+msgstr "Boekingen"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "Debetcentralisering"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
 msgid "Confirm draft invoices"
-msgstr ""
+msgstr "Conceptfacturen bevestigen"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -166,89 +170,97 @@ msgid ""
 "positive, it gives the day of the next month. Set 0 for net days (otherwise "
 "it's based on the beginning of the month)."
 msgstr ""
+"Dag van de maand, -1 instellen voor laatste datum huidige maand. Indien \r\n"
+"positief, eerste dag van volgende maand. 0 instellen voor nettodagen (andere "
+"\r\n"
+"gebaseerd op begin van de maand)."
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr ""
+msgstr "Totaal credit"
 
 #. module: account
 #: field:account.config.wizard,charts:0
 msgid "Charts of Account"
-msgstr ""
+msgstr "Boekhoudplannen"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
 msgid "Move line select"
-msgstr ""
+msgstr "Lijnselectie verplaatsen"
 
 #. module: account
-#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0
+#: rml:account.tax.code.entries:0
 msgid "Entry label"
-msgstr ""
+msgstr "Omschrijving boeking"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr ""
+msgstr "Rekeningmodelboekingen"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
 msgid "Period Sum"
-msgstr ""
+msgstr "Periodesom"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr ""
+msgstr "Berekeningscode (als type=code)"
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "Lijn boeking op rekening"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
 msgid "Aged Trial Balance"
-msgstr ""
+msgstr "Ageingbalans"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurrent Entries"
-msgstr ""
+msgstr "Standaardboekingen"
 
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
-#: field:account.invoice.tax,amount:0 field:account.move,amount:0
-#: field:account.tax,amount:0 field:account.tax.template,amount:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.reconcile.line,amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: field:account.move,amount:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Bedrag"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
 #: model:ir.actions.wizard,name:account.wizard_third_party_ledger
 #: model:ir.ui.menu,name:account.menu_third_party_ledger
 msgid "Partner Ledger"
-msgstr ""
+msgstr "Relatieplan"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr ""
+msgstr "Leveranciers-btw"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr ""
+msgstr "Totaal debet"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Accounting Entries-"
-msgstr ""
+msgstr "Journaalposten-"
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -258,101 +270,120 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Geeft de weergave wanneer mutaties in het dagboek worden geschreven of "
+"doorgebladerd. De weergave verteld Open ERP welke velden er zichtbaar, "
+"verplicht of alleen lezen moeten zijn en in welke volgorde. U kunt uw eigen "
+"weergave aanmaken voor een snellere codering in elk dagboek."
 
 #. module: account
-#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
+"Als u betalingsvoorwaarden gebruikt, wordt de vervaldatum automatisch \r\n"
+"berekend als u een boeking doet. Als u de betalingsvoorwaarde en de \r\n"
+"vervaldatum niet invult, gaat het systeem uit van contante betaling. De \r\n"
+"betalingsvoorwaarde kan ook meerdere vervaldatums bepalen, vb. 50% nu en 50% "
+"\r\n"
+"binnen een maand."
 
 #. module: account
-#: selection:account.tax,type:0 selection:account.tax.template,type:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Vast"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
 msgid "Overdue Payments"
-msgstr ""
+msgstr "Achterstallige betalingen"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 #: wizard_view:account.vat.declaration,init:0
 msgid "Select period"
-msgstr ""
+msgstr "Periode kiezen"
 
 #. module: account
-#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Oorsprong"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Naam beweging"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Reference"
-msgstr ""
+msgstr "Referentie"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr ""
+msgstr "Abonnementen berekenen"
 
 #. module: account
 #: rml:account.central.journal:0
 msgid "Account Num."
-msgstr ""
+msgstr "Rekeningnr."
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Debit"
-msgstr ""
+msgstr "Delta debet"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice,amount_tax:0
+#: model:account.account.type,name:account.account_type_tax
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Belasting"
 
 #. module: account
 #: rml:account.general.journal:0
 msgid "Debit Trans."
-msgstr ""
+msgstr "Debettrans."
 
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analytische rekening"
 
 #. module: account
-#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Btw op onderliggende records"
 
 #. module: account
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr ""
+msgstr "Journaalnaam"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on invoices"
-msgstr ""
+msgstr "Omschrijving op facturen"
 
 #. module: account
 #: constraint:account.analytic.account:0
@@ -362,24 +393,24 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
 msgid "Total entries"
-msgstr ""
+msgstr "Totaal boekingen"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "Bronrekening"
 
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr ""
+msgstr "Annuleren posten toelaten"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0
 msgid "Payment Reconcilation"
-msgstr ""
+msgstr "Afpunten betalingen"
 
 #. module: account
 #: model:account.journal,name:account.expenses_journal
@@ -389,74 +420,81 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
-msgstr ""
+msgstr "Alle analytische boekingen"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Date:"
-msgstr ""
+msgstr "Datum"
 
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Negative"
-msgstr ""
+msgstr "Negatief"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "Naam (rekening/relatie)"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Contra"
-msgstr ""
+msgstr "Tegenover"
 
 #. module: account
-#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
-#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
+#: field:account.analytic.account,state:0
+#: field:account.bank.statement,state:0
+#: field:account.invoice,state:0
+#: view:account.move:0
+#: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree13
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13
 msgid "Unpaid Supplier Refunds"
-msgstr ""
+msgstr "Openstaande leveranciersterugbetalingen"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Special Computation"
-msgstr ""
+msgstr "Speciale berekening"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement with/without reconciliation from draft statement"
 msgstr ""
+"Bevestig uittreksel met/zonder afpunting op basis van voorlopig uittreksel"
 
 #. module: account
 #: wizard_view:account.move.bank.reconcile,init:0
 #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
 msgid "Bank reconciliation"
-msgstr ""
+msgstr "Afstemming banksaldo"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Korting(%)"
 
 #. module: account
-#: rml:account.general.ledger:0 field:account.model,ref:0
-#: field:account.move,ref:0 rml:account.overdue:0
+#: rml:account.general.ledger:0
+#: field:account.model,ref:0
+#: field:account.move,ref:0
+#: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Ref"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr ""
+msgstr "Btw-type"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -464,81 +502,84 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
+"Geef aan of het btw-bedrag moet worden opgenomen in het basisbedrag voordat "
+"\r\n"
+"de volgende btw wordt berekend."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr ""
+msgstr "Periodieke verwerking"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "Statistieken analyt. boekingen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr ""
+msgstr "Sjablonen btw-codes"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Supplier invoice"
-msgstr ""
+msgstr "Leverancierfactuur"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr ""
+msgstr "Betaald afpunten"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
 msgid "Target Moves"
-msgstr ""
+msgstr "Doelbewegingen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
 msgid "Tax Templates"
-msgstr ""
+msgstr "Btw-sjablonen"
 
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr ""
+msgstr "Betaald/afgepunt"
 
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr ""
+msgstr "Overdrachtsmethode"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr ""
+msgstr "Opnemen in basisbedrag"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Code basis terugbetaling"
 
 #. module: account
 #: view:account.invoice.line:0
 msgid "Line"
-msgstr ""
+msgstr "Lijn"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "J.C. or Move name"
-msgstr ""
+msgstr "Naam beweging"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr ""
+msgstr "Waar"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -546,6 +587,8 @@ msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
 msgstr ""
+"Aantal dagen toe te voegen voor berekening van dag van de maand. Als datum "
+"=15/01, aantal dagen =22, dag van de maand =-1, dan is de vervaldatum 28/02."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -555,23 +598,23 @@ msgstr ""
 #. module: account
 #: rml:account.central.journal:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Afdrukdatum"
 
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Mvt"
-msgstr ""
+msgstr "Bew."
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr ""
+msgstr "Ageingbalans relaties"
 
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr ""
+msgstr "Controle boekingen"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -579,91 +622,97 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
 msgstr ""
+"Volgorde wordt gebruikt om de resources te sorteren van laag naar hoog"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 #: wizard_view:account.analytic.line,init:0
 msgid "(Keep empty to open the current situation)"
-msgstr ""
+msgstr "(leeg om de huidige situatie te openen)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Fiscal Position Accounts Mapping"
-msgstr ""
+msgstr "Rekeningkoppeling fiscale positie"
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Contact"
 
 #. module: account
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr ""
+msgstr "Betalingsvoorwaarde relatie"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr ""
+msgstr "Afstemmen rekeningboeking"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
 msgid "Open for bank reconciliation"
-msgstr ""
+msgstr "Open voor afstemming banksaldo"
 
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Korting (%)"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,writeoff:0
 #: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
 msgid "Write-Off amount"
-msgstr ""
+msgstr "Afschrijvingsbedrag"
 
 #. module: account
 #: help:account.fiscalyear,company_id:0
 msgid "Keep empty if the fiscal year belongs to several companies."
-msgstr ""
+msgstr "Leeg laten als het fiscaal jaar voor meerdere firma's geldt."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analytische boekhouding"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Sub-Total :"
-msgstr ""
+msgstr "Subtotaal:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0
+#: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Analytische boekingen"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "Maand"
 
 #. module: account
 #: field:account.analytic.account,partner_id:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Gekoppelde relatie"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr ""
+msgstr "Extra informatie"
 
 #. module: account
 #: selection:account.invoice,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Terugbetaling klant"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -671,89 +720,95 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr ""
+msgstr "Teken btw-bedrag"
 
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr ""
+msgstr "Totaalbedrag dat de klant is verschuldigd."
 
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr ""
+msgstr "St."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_line_open
 msgid "account.move.line"
-msgstr ""
+msgstr "account.move.line"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "Analytic Invoice"
-msgstr ""
+msgstr "Analytische factuur"
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr ""
+msgstr "Veldnaam"
 
 #. module: account
-#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0
+#: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
-msgstr ""
+msgstr "Teken voor hoofdcode"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr ""
+msgstr "Journaal eindejaarsboekingen"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Aankoopeigenschappen"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
 msgid "Can be draft or validated"
-msgstr ""
+msgstr "Concept of gevalideerd"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,reconcile:0
 msgid "Partial Payment"
-msgstr ""
+msgstr "Deelbetaling"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Move Lines Created."
-msgstr ""
+msgstr "Gemaakte lijnen verplaatsen"
 
 #. module: account
-#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
-#: field:account.move,state:0 field:account.move.line,state:0
-#: field:account.period,state:0 field:account.subscription,state:0
+#: field:account.fiscalyear,state:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: field:account.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "Periode tot"
 
 #. module: account
 #: field:account.account.type,partner_account:0
 msgid "Partner account"
-msgstr ""
+msgstr "Relatierekening"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Generate entries before:"
-msgstr ""
+msgstr "Genereren boekingen voor:"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -761,7 +816,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr ""
+msgstr "Kostenstaat"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -769,18 +824,18 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "(Keep empty for all open fiscal years)"
-msgstr ""
+msgstr "(Leeg voor alle geopende boekjaren)"
 
 #. module: account
 #: field:account.invoice,move_lines:0
 msgid "Move Lines"
-msgstr ""
+msgstr "Mutatielijnen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
 msgid "Account cost and revenue by journal"
-msgstr ""
+msgstr "Winst- en verliesrekeningen per journaal"
 
 #. module: account
 #: help:account.account.template,user_type:0
@@ -788,83 +843,85 @@ msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
 msgstr ""
+"Deze types hangen af van uw land. Het type bevat meer info over de rekening "
+"en diens kenmerken."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_30
 msgid "Bank Reconciliation"
-msgstr ""
+msgstr "Afpunten banksaldo"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr ""
+msgstr "Rekeningmodellen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Analytische rekeningen"
 
 #. module: account
 #: wizard_view:account.print.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_print_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Print Journal"
-msgstr ""
+msgstr "Journaal afdrukken"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr ""
+msgstr "account.bank.accounts.wizard"
 
 #. module: account
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Aanmaakdatum"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,cancel_invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Factuur annuleren"
 
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+msgstr "Verplicht"
 
 #. module: account
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Kostenrekening"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
 msgid "Write-Off Journal"
-msgstr ""
+msgstr "Afschrijvingsjournaal"
 
 #. module: account
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr ""
+msgstr "Bedrag valuta"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr ""
+msgstr "Kostencategorierekening"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
 msgid "New Fiscal Year"
-msgstr ""
+msgstr "Nieuw boekjaar"
 
 #. module: account
 #: help:account.tax,tax_group:0
@@ -872,27 +929,31 @@ msgid ""
 "If a default tax is given in the partner it only overrides taxes from "
 "accounts (or products) in the same group."
 msgstr ""
+"Als de standaard-btw voor de relatie is gedefinieerd, overschrijft deze "
+"alleen de btw ingesteld op rekeningen (of producten) in dezelfde groep."
 
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr ""
+msgstr "Te openen boekjaar"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr ""
+msgstr "Boekhoudplan kiezen"
 
 #. module: account
 #: field:account.analytic.account,quantity:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
-#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Hoeveelheid"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_to:0
@@ -900,67 +961,71 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,date2:0
 #: wizard_field:account.third_party_ledger.report,init,date2:0
 msgid "End date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr ""
+msgstr "Basisbedrag"
 
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr ""
+msgstr "Gebruiker die voor het journaal verantwoordelijk is"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr ""
+msgstr "Standaard debetrekening"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr ""
+msgstr "Boekingen per uittreksel"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 msgid "analytic Invoice"
-msgstr ""
+msgstr "Analytische factuur"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0 rml:account.general.journal:0
+#: view:account.fiscalyear:0
+#: rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0 field:account.move,period_id:0
+#: field:account.journal.period,period_id:0
+#: field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0
+#: view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
-msgstr ""
+msgstr "Periode"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr ""
+msgstr "Eindtotaal"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr ""
+msgstr "Financiële boekhouding"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Nettototaal:"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -970,68 +1035,68 @@ msgstr ""
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Fiscale positie"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "Eenh."
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
 msgid "One Partner Per Page"
-msgstr ""
+msgstr "Een relatie per bladzijde"
 
 #. module: account
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Afhankel."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Fiscal Position Taxes Mapping"
-msgstr ""
+msgstr "Btw-koppeling fiscale positie"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
 msgid "New Supplier Invoice"
-msgstr ""
+msgstr "Nieuwe leveranciersfactuur"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,amount:0
 msgid "Amount paid"
-msgstr ""
+msgstr "Betaald bedrag"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: model:process.transition,name:account.process_transition_customerinvoice0
 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Klantenfactuur"
 
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
 msgid "Choose Fiscal Year"
-msgstr ""
+msgstr "Boekjaar kiezen"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr ""
+msgstr "Hoofdvolgorde"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr ""
+msgstr "Analytische journalen afdrukken"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Voucher Nb"
-msgstr ""
+msgstr "Boekingsnr."
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -1039,124 +1104,127 @@ msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
 msgstr ""
+"Volgorde wordt gebruikt om de betalingsvoorwaarden te sorteren van laag naar "
+"hoog."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
 msgid "Total write-off"
-msgstr ""
+msgstr "Totaal afgeschreven"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Code voor prijzen inclusief btw berekenen"
 
 #. module: account
 #: view:account.invoice.tax:0
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr ""
+msgstr "Btw-codes"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "Boekhoudplansjabloon"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr ""
+msgstr "Inkomstencategorierekening"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr ""
+msgstr "Nieuwe analytische rekening"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Position Templates"
-msgstr ""
+msgstr "Sjablonen fiscale posities"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Eenheidsprijs"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Period from :"
-msgstr ""
+msgstr "Periode van:"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "wizard.multi.charts.accounts"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr ""
+msgstr "Verkoopdagboek"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr ""
+msgstr "Het bedrag uitgedrukt in een optionele andere munt."
 
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr ""
+msgstr "Sjabloon fiscale posities"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr ""
+msgstr "Voorwaarden"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Report"
-msgstr ""
+msgstr "Belasting-aangifte"
 
 #. module: account
 #: wizard_button:account.analytic.account.chart,init,open:0
 #: wizard_button:account.chart,init,open:0
 msgid "Open Charts"
-msgstr ""
+msgstr "Open boekhoudplannen"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
 msgid "Are you sure you want to close the fiscal year ?"
-msgstr ""
+msgstr "Bent u zeker dat u het boekjaar wilt afsluiten?"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Receipt"
-msgstr ""
+msgstr "Bankontvangst"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr ""
+msgstr "Bankrekening"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr ""
+msgstr "Lijst btw-sjablonen"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Invoice import"
-msgstr ""
+msgstr "Import facturen"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
 msgid "Standard entry"
-msgstr ""
+msgstr "Standaardboeking"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -1167,127 +1235,139 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
+"Hiermee kiest u hoe de koers voor uitgaande transacties wordt berekend. In "
+"\r\n"
+"de meeste landen is \"gemiddeld\" de wettelijke manier, maar slechts weinig "
+"\r\n"
+"softwaresystemen kunnen dit. Als u dus importeert uit een ander \r\n"
+"softwarepakket, dient u wellicht de koers op datum te gebruiken. Inkomende "
+"\r\n"
+"transacties gebeuren altijd volgens de dagkoers."
 
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Firmamunt"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Fiscal Position Template Account Mapping"
-msgstr ""
+msgstr "Rekeningkoppeling sjabloon fiscale positie"
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Primaire analytische rekening"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
 msgid "Reconcile With Write-Off"
-msgstr ""
+msgstr "Afpunten met afschrijving"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr ""
+msgstr "Btw-/basisbedrag"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,code_digits:0
 msgid "No. of Digits to use for account code"
-msgstr ""
+msgstr "Aantal cijfers voor de rekeningcode"
 
 #. module: account
 #: field:account.bank.statement,balance_end_real:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Eindbalans"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr ""
+msgstr "Aankoopbtw"
 
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr ""
+msgstr "Lijnnaam"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Vast bedrag"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Credit"
-msgstr ""
+msgstr "Analytisch credit"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
 #: wizard_button:account.move.line.reconcile,init_partial,partial:0
 msgid "Partial Reconcile"
-msgstr ""
+msgstr "Gedeeltelijke afpunting"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr ""
+msgstr "Niet-afgepunte transacties"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr ""
+msgstr "Btw-koppeling"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Doorgaan"
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Value"
-msgstr ""
+msgstr "Waarde"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
 #: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Afschrijvingsrekening"
 
 #. module: account
-#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0
+#: field:account.subscription,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr ""
+msgstr "Boekjaar afsluiten"
 
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Centralisatiesaldo"
 
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr ""
+msgstr "Boodschap"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr ""
+msgstr "Kies de facturen die u wilt betalen en verwerk voorschotten"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0
+#: field:account.journal,view_id:0
 msgid "View"
-msgstr ""
+msgstr "Weergave"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -1295,24 +1375,24 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "Alles"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic lines"
-msgstr ""
+msgstr "Analytische lijnen"
 
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr ""
+msgstr "De berekeningsmethode voor het btw-bedrag."
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Validated accounting entries."
-msgstr ""
+msgstr "Gevalideerde boekingen"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -1321,32 +1401,34 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
+"Als u afgepunte transacties ongedaan maakt, moet u alle gekoppelde acties "
+"nakijken, want deze worden niet uitgeschakeld"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "Elektronisch bestand"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr ""
+msgstr "Klantencredit"
 
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr ""
+msgstr "Btw-lijnen"
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "Volgorden"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
 #: model:ir.ui.menu,name:account.menu_action_account_type_form
 msgid "Account Types"
-msgstr ""
+msgstr "Rekeningsoorten"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,journal_id:0
@@ -1354,7 +1436,8 @@ msgstr ""
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1367,46 +1450,51 @@ msgstr ""
 #: wizard_field:populate_statement_from_inv,init,journal_id:0
 #: field:report.hr.timesheet.invoice.journal,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Journaal"
 
 #. module: account
-#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0
+#: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Afhankelijke rekeningen"
 
 #. module: account
 #: field:account.account,check_history:0
 msgid "Display History"
-msgstr ""
+msgstr "Historiek tonen"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,date1:0
 msgid "        Start date"
-msgstr ""
+msgstr "        Begindatum"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,display_account:0
 #: wizard_field:account.general.ledger.report,checktype,display_account:0
 msgid "Display accounts "
-msgstr ""
+msgstr "Rekeningen tonen "
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr ""
+msgstr "Lijn afschriften afpunten"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr ""
+msgstr "Leeg laten voor opbrengstenrekening"
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Afschrijving"
 
 #. module: account
 #: help:account.invoice,partner_bank:0
@@ -1414,97 +1502,99 @@ msgid ""
 "The partner bank account to pay\n"
 "Keep empty to use the default"
 msgstr ""
+"De bankrekening van de relatie voor betaling.\n"
+"Laat leeg voor de standaardwaarde."
 
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Totaal te betalen"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close.state,init,close:0
 msgid "Close states"
-msgstr ""
+msgstr "Status gesloten"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
 msgid "wizard.company.setup"
-msgstr ""
+msgstr "wizard.company.setup"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr ""
+msgstr "account.analytic.line.extended"
 
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Terugbetalingsjournaal"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
 msgid "Income"
-msgstr ""
+msgstr "Inkomsten"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Supplier"
-msgstr ""
+msgstr "Leverancier"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "Btw-bedrag"
 
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Positive"
-msgstr ""
+msgstr "Positief"
 
 #. module: account
 #: wizard_view:account.general.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_general_journal
 #: model:ir.ui.menu,name:account.menu_general_journal
 msgid "Print General Journal"
-msgstr ""
+msgstr "Algemeen dagboek afdrukken"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr ""
+msgstr "Sjablonen boekhoudplan"
 
 #. module: account
 #: field:account.invoice,move_id:0
 msgid "Invoice Movement"
-msgstr ""
+msgstr "Factuurbeweging"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_wizard
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Boekhoudplan maken op basis van sjabloon"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Statements"
-msgstr ""
+msgstr "Wettelijke staten"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr ""
+msgstr "Hoofdcode"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile.select,init,open:0
 msgid "Open for reconciliation"
-msgstr ""
+msgstr "Open voor afstemming"
 
 #. module: account
 #: model:account.journal,name:account.bilan_journal
@@ -1515,82 +1605,86 @@ msgstr ""
 #: selection:account.tax,tax_group:0
 #: selection:account.tax.template,tax_group:0
 msgid "VAT"
-msgstr ""
+msgstr "BTW"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Account n°"
-msgstr ""
+msgstr "Rekeningnr."
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr ""
+msgstr "Leeg laten voor kostenrekening"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,account_ids:0
 msgid "Account to reconcile"
-msgstr ""
+msgstr "Af te stemmen rekening"
 
 #. module: account
-#: rml:account.invoice:0 field:account.model.line,partner_id:0
+#: rml:account.invoice:0
+#: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Relatieref."
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
 #: selection:account.third_party_ledger.report,init,result_selection:0
 msgid "Receivable and Payable Accounts"
-msgstr ""
+msgstr "Te ontvangen en te betalen"
 
 #. module: account
-#: view:account.subscription:0 field:account.subscription,lines_id:0
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr ""
+msgstr "Abonnementslijnen"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
-msgstr ""
+msgstr "Aankoop"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total quantity"
-msgstr ""
+msgstr "Totale hvh"
 
 #. module: account
 #: field:account.invoice,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Vervaldatum"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
 #: wizard_button:account.period.close,init,close:0
 msgid "Close Period"
-msgstr ""
+msgstr "Periode afsluiten"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Due"
-msgstr ""
+msgstr "Vervallen"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Third party"
-msgstr ""
+msgstr "Derde"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
-msgstr ""
+msgstr "Toegelaten rekeningtypen (leeg indien geen controle)"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Beginbalans"
 
 #. module: account
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
@@ -1598,29 +1692,29 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
 msgid "Journals"
-msgstr ""
+msgstr "Journalen"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr ""
+msgstr "Max. hvh"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,refund:0
 msgid "Refund Invoice"
-msgstr ""
+msgstr "Factuur terugbetalen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.actions.wizard,name:account.wizard_period_close
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr ""
+msgstr "Periode afsluiten"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
 msgid "Costs & Revenues"
-msgstr ""
+msgstr "Winst en verlies"
 
 #. module: account
 #: constraint:account.account:0
@@ -1635,89 +1729,90 @@ msgstr ""
 #. module: account
 #: view:account.config.wizard:0
 msgid "Skip"
-msgstr ""
+msgstr "Overslaan"
 
 #. module: account
 #: field:account.invoice,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Periode afdwingen"
 
 #. module: account
 #: help:account.account.type,sequence:0
 msgid "Gives the sequence order when displaying a list of account types."
-msgstr ""
+msgstr "Toont de volgorde bij het weergeven van een lijst met rekeningtypes."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr ""
+msgstr "Heropenen"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Are you sure you want to create entries?"
-msgstr ""
+msgstr "Bent u zeker dat u de boeking wilt uitvoeren?"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Include in base amount"
-msgstr ""
+msgstr "Opnemen in basisbedrag"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Credit"
-msgstr ""
+msgstr "Delta credit"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr ""
+msgstr "Afpunten boekingen ongedaan maken"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Pre-generated invoice from control"
-msgstr ""
+msgstr "Vooraf gemaakte factuur uit controle"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "Cost Legder for period"
-msgstr ""
+msgstr "Kostenplaats voor periode"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr ""
+msgstr "Nieuw uittreksel"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
 #: wizard_field:account.analytic.line,init,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Van"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Reconciliation of entries from invoice(s) and payment(s)"
-msgstr ""
+msgstr "Afpunting of boekingen uit factuur en betaling"
 
 #. module: account
 #: wizard_view:account.central.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_central_journal
 #: model:ir.ui.menu,name:account.menu_central_journal
 msgid "Print Central Journal"
-msgstr ""
+msgstr "Centralisatiedagboek afdrukken"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,period_length:0
 msgid "Period length (days)"
-msgstr ""
+msgstr "Lengte periode (dagen)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
-msgstr ""
+msgstr "Procent"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
@@ -1725,50 +1820,51 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
-msgstr ""
+msgstr "Verkoop"
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,checktype:0
 #: wizard_button:account.general.ledger.report,account_selection,checktype:0
 msgid "Next"
-msgstr ""
+msgstr "Volgende"
 
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
 "The fiscal position will determine taxes and the accounts used for the the "
 "partner."
-msgstr ""
+msgstr "Fiscale positie bepaalt btw en rekeningen voor de relatie."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "Date or Code"
-msgstr ""
+msgstr "Datum of code"
 
 #. module: account
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr ""
+msgstr "Account Manager"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "to :"
-msgstr ""
+msgstr "tot:"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,debit:0
 #: wizard_field:account.move.line.reconcile,init_partial,debit:0
 msgid "Debit amount"
-msgstr ""
+msgstr "Debetbedrag"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: account
 #: wizard_button:account.account.balance.report,checktype,report:0
@@ -1785,12 +1881,12 @@ msgstr ""
 #: wizard_button:account.print.journal.report,init,print:0
 #: wizard_button:account.third_party_ledger.report,init,checkreport:0
 msgid "Print"
-msgstr ""
+msgstr "Afdrukken"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
 msgid "Start date"
-msgstr ""
+msgstr "Begindatum"
 
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
@@ -1799,38 +1895,40 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
-#: field:account.journal,type:0 field:account.move,type:0
-#: field:account.move.reconcile,type:0 xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: field:account.journal,type:0
+#: field:account.move,type:0
+#: field:account.move.reconcile,type:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
-msgstr ""
+msgstr "Toegelaten rekeningen (leeg indien geen controle)"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Nettobedrag"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr ""
+msgstr "Btw-rekening facturen"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr ""
+msgstr "Analytische lijnen"
 
 #. module: account
 #: wizard_view:account.invoice.pay,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_pay
 msgid "Pay invoice"
-msgstr ""
+msgstr "Factuur betalen"
 
 #. module: account
 #: constraint:account.invoice:0
@@ -1841,12 +1939,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
 #: model:ir.ui.menu,name:account.menu_invoice_draft
 msgid "Draft Customer Invoices"
-msgstr ""
+msgstr "Voorlopige facturen klanten"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "Rekeningabonnementlijn"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -1854,104 +1952,105 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "No Filter"
-msgstr ""
+msgstr "Geen filter"
 
 #. module: account
 #: field:account.payment.term.line,days:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Aantal dagen"
 
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "Relatiereferentie van factuur"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
 msgid "Sort by:"
-msgstr ""
+msgstr "Sorteren op:"
 
 #. module: account
 #: field:account.move,to_check:0
 msgid "To Be Verified"
-msgstr ""
+msgstr "Te controleren"
 
 #. module: account
 #: help:res.partner,debit:0
 msgid "Total amount you have to pay to this supplier."
-msgstr ""
+msgstr "Totaalbedrag te betalen voor deze leverancier."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
-msgstr ""
+msgstr "Overdrachten"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Li."
-msgstr ""
+msgstr "Li."
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "Account charts"
-msgstr ""
+msgstr "Boekhoudplannen"
 
 #. module: account
 #: help:account.tax,name:0
 msgid "This name will be displayed on reports"
-msgstr ""
+msgstr "Deze naam wordt op de rapporten getoond."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr ""
+msgstr "Afdrukdatum"
 
 #. module: account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ongeldige XML voor weergave!"
 
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
 msgid "          Start date"
-msgstr ""
+msgstr "          Begindatum"
 
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Analytisch journaalrapport"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr ""
+msgstr "Terugbetaling klant"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Btw-bedrag"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr ""
+msgstr "J.C. / Naam beweging"
 
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr ""
+msgstr "Journaal- Periodenaam"
 
 #. module: account
-#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr ""
+msgstr "Naam btw-vak"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -1960,17 +2059,21 @@ msgid ""
 "'draft' state and instead goes directly to the 'posted state' without any "
 "manual validation."
 msgstr ""
+"Schakel dit vakje in als u voor nieuwe rekeningbewegingen de status\r\n"
+"'voorlopig' wilt overslaan en onmiddellijk wilt boeken zonder manuele\r\n"
+"validering."
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
 #: field:wizard.company.setup,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: account
 #: help:account.invoice,number:0
@@ -1978,58 +2081,60 @@ msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
 msgstr ""
+"Uniek factuurnummer dat automatisch wordt berekend bij het aanmaken van de "
+"factuur."
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Voorlopige factuur"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_expense
 msgid "Expense"
-msgstr ""
+msgstr "Uitgave"
 
 #. module: account
 #: field:account.journal,invoice_sequence_id:0
 msgid "Invoice Sequence"
-msgstr ""
+msgstr "Factuurnummering"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 msgid "Options"
-msgstr ""
+msgstr "Opties"
 
 #. module: account
 #: model:process.process,name:account.process_process_invoiceprocess0
 msgid "Customer Invoice Process"
-msgstr ""
+msgstr "Verkoopfactuurprocedure"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Opmerking fiscale positie:"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "Periode openingsboekingen"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line
 #: model:ir.ui.menu,name:account.menu_validate_account_moves
 msgid "Validate Account Moves"
-msgstr ""
+msgstr "Rekeningbewegingen valideren"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "days"
-msgstr ""
+msgstr "dagen"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Past"
-msgstr ""
+msgstr "Vorige"
 
 #. module: account
 #: field:account.analytic.account,company_currency_id:0
@@ -2037,48 +2142,51 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
-#: field:account.journal,currency:0 field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.journal,currency:0
+#: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid invoices"
-msgstr ""
+msgstr "Onbetaalde facturen"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment Reconcile"
-msgstr ""
+msgstr "Afpunten betalingen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
 msgid "Statements reconciliation"
-msgstr ""
+msgstr "Afschriften afpunten"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_new
 msgid "New Subscription"
-msgstr ""
+msgstr "Nieuw abonnement"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr ""
+msgstr "Berekening"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr ""
+msgstr "Analytische boeking"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Boodschap vervallen facturen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
@@ -2089,53 +2197,54 @@ msgstr ""
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
-msgstr ""
+msgstr "Waarde bedrag"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr ""
+msgstr "Afgepunte boekingen"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Adres contactpersoon"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr ""
+msgstr "Trimestriële perioden maken"
 
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr ""
+msgstr "(leeg voor de huidige periode)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree8
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree8
 msgid "Draft Supplier Invoices"
-msgstr ""
+msgstr "Voorlopige facturen leveranciers"
 
 #. module: account
 #: wizard_field:account.invoice.refund,init,period:0
 msgid "Force period"
-msgstr ""
+msgstr "Periode afdwingen"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr ""
+msgstr "Detail"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Consolidation"
-msgstr ""
+msgstr "Consolidatie"
 
 #. module: account
 #: field:account.chart.template,account_root_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "Rootrekening"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2144,11 +2253,16 @@ msgid ""
 "stay unpaid. Please, take appropriate measures in order to carry out this "
 "payment in the next 8 days."
 msgstr ""
+"Mogen wij u erop attent maken, behoudens vergissing van onze kant, dat de "
+"\r\n"
+"volgende facturen nog niet zijn betaald. Gelieve het nodige te doen om de "
+"\r\n"
+"betaling ervan binnen de 8 dagen uit te voeren."
 
 #. module: account
 #: rml:account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "Btw:"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,account_selection,Account_list:0
@@ -2157,7 +2271,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr ""
+msgstr "Boekhoudplan"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
@@ -2168,27 +2282,27 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Create subscription entries"
-msgstr ""
+msgstr "Abonnementsboekingen maken"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
 msgid "Opening Entries Journal"
-msgstr ""
+msgstr "Openingsjournaal"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Create a Fiscal Year"
-msgstr ""
+msgstr "Boekjaar maken"
 
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr ""
+msgstr "Klant-btw"
 
 #. module: account
 #: field:account.invoice,date_invoice:0
 msgid "Date Invoiced"
-msgstr ""
+msgstr "Datum gefactureerd"
 
 #. module: account
 #: help:account.account.balance.report,checktype,periods:0
@@ -2197,7 +2311,7 @@ msgstr ""
 #: help:account.third_party_ledger.report,init,periods:0
 #: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Alle periodes indien blanco"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2207,100 +2321,107 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
-msgstr ""
+msgstr "(Als u geen boekjaar kiest, worden alle boekjaren genomen)"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "De rekeningbasis van de btw-aangifte."
 
 #. module: account
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0
+#: rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0 field:account.move,date:0
+#: rml:account.journal.period.print:0
+#: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
+#: field:account.subscription.line,date:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Reference Type"
-msgstr ""
+msgstr "Referentietype"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile,init,unrec:0
 #: wizard_button:account.reconcile.unreconcile,init,unrec:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Afpunten ongedaan maken"
 
 #. module: account
-#: field:account.tax,type:0 field:account.tax.template,type:0
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr ""
+msgstr "Btw-type"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr ""
+msgstr "Uittrekselboekingen"
 
 #. module: account
-#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0
+#: field:account.journal,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_template_form
 msgid "Account Templates"
-msgstr ""
+msgstr "Rekeningsjablonen"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr ""
+msgstr "Sjablonen boekhoudplan"
 
 #. module: account
 #: model:account.journal,name:account.refund_sales_journal
 msgid "Journal d'extourne"
-msgstr ""
+msgstr "Betalingsdagboek"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Voucher No"
-msgstr ""
+msgstr "Stuknr."
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic reconciliation"
-msgstr ""
+msgstr "Automatisch afpunten"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Import Invoice"
-msgstr ""
+msgstr "Facturen importeren"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "and Journals"
-msgstr ""
+msgstr "en journalen"
 
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr ""
+msgstr "Btw rekening"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -2310,7 +2431,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.accounts.wizard,acc_no:0
 msgid "Account No."
-msgstr ""
+msgstr "Rekeningnr."
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -2318,11 +2439,13 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
+"Geef aan of de btw-berekening is gebaseerd op de berekening van de "
+"onderliggende btw in plaats van op het totaal bedrag."
 
 #. module: account
 #: rml:account.central.journal:0
 msgid "Journal Code"
-msgstr ""
+msgstr "Journaalcode"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -2330,39 +2453,44 @@ msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
 msgstr ""
+"Indien niet van toepassing (Python-code) verschijnt de btw niet op de "
+"factuur."
 
 #. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
-msgstr ""
+msgstr "Modelboekingen"
 
 #. module: account
 #: field:account.analytic.account,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: account
-#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0
+#: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
-msgstr ""
+msgstr "Boekingslijnen"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
-msgstr ""
+msgstr "Van toepassing zijnde code (als type=code)"
 
 #. module: account
 #: wizard_button:account.move.journal,init,open:0
 msgid "Open Journal"
-msgstr ""
+msgstr "Journaal openen"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "KI"
-msgstr ""
+msgstr "KI"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_account_analytic_line
@@ -2370,47 +2498,47 @@ msgstr ""
 #: model:ir.ui.menu,name:account.account_entries_analytic_entries
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 msgid "Entries Encoding by Line"
-msgstr ""
+msgstr "Boekingen ingeven per lijn"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
 msgid "List of all the taxes that have to be installed by the wizard"
-msgstr ""
+msgstr "Lijst met alle btw-codes te installeren door wizard"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period from"
-msgstr ""
+msgstr "Periode van"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr ""
+msgstr "Rekeninguittreksel"
 
 #. module: account
 #: wizard_view:account.invoice.pay,addendum:0
 #: wizard_view:account.move.line.reconcile,addendum:0
 msgid "Information addendum"
-msgstr ""
+msgstr "Addenduminfo"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Entries Reconcile"
-msgstr ""
+msgstr "Boekingen afpunten"
 
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_amount:0
 msgid "The amount in the currency of the journal"
-msgstr ""
+msgstr "Liggend"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
 msgid "Landscape Mode"
-msgstr ""
+msgstr "Maak factuur volgens analytische rekeningen"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -2439,9 +2567,11 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0
+#: wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0
+#: view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2460,84 +2590,90 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: account
 #: field:account.account.type,name:0
 msgid "Acc. Type Name"
-msgstr ""
+msgstr "Rekeningsoortnaam"
 
 #. module: account
-#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr ""
+msgstr "Gebruik deze code voor de btw-aangifte"
 
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "Litigation"
-msgstr ""
+msgstr "Betwist"
 
 #. module: account
-#: view:account.move.line:0 wizard_view:account.move.validate,init:0
+#: view:account.move.line:0
+#: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
-msgstr ""
+msgstr "Informatie"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_tax_report
 msgid "Taxes Reports"
-msgstr ""
+msgstr "Btw-aangiften"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr ""
+msgstr "Te betalen"
 
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Import Invoices in Statement"
-msgstr ""
+msgstr "Facturen importeren in uittreksel"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Other Info"
-msgstr ""
+msgstr "Andere info"
 
 #. module: account
 #: field:account.journal,default_credit_account_id:0
 msgid "Default Credit Account"
-msgstr ""
+msgstr "Standaard creditrekening"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
 msgid "Payment Order"
-msgstr ""
+msgstr "Betalingsopdracht"
 
 #. module: account
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr ""
+msgstr "Schakel deze optie in als de gebruiker deze rekening mag afpunten."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic"
-msgstr ""
+msgstr "Analytisch"
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Factuur maken"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
@@ -2547,17 +2683,17 @@ msgstr ""
 #. module: account
 #: field:wizard.company.setup,overdue_msg:0
 msgid "Overdue Payment Message"
-msgstr ""
+msgstr "Boodschap vervallen facturen"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr ""
+msgstr "Sjablonen btw-codes"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "In dispute"
-msgstr ""
+msgstr "Geschillen"
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2568,42 +2704,49 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for deprecated "
 "accounts."
 msgstr ""
+"Dit type dient om bepaalde eigenschappen binnen OpenERP te onderscheiden:\r\n"
+"weergave bevat geen boekingen; consolidatierekeningen zijn rekeningen die\r\n"
+"onderliggende rekeningen kunnen hebben voor het consolideren van meerdere\r\n"
+"firma's; te betalen/te ontvangen zijn centralisatierekeningen (voor "
+"debet/creditberekeningen),\r\n"
+"gesloten dient voor niet meer gebruikte rekeningen."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Year Treatments"
-msgstr ""
+msgstr "Verwerkingen einde jaar"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_generic_report
 msgid "Generic Reports"
-msgstr ""
+msgstr "Generieke rapporten"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,power:0
 msgid "Power"
-msgstr ""
+msgstr "Kracht"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
 msgid "Account Analytic Lines Analysis"
-msgstr ""
+msgstr "Analyse analytische lijnen"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Price"
-msgstr ""
+msgstr "Prijs"
 
 #. module: account
-#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
-msgstr ""
+msgstr "‎-"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "asgfas"
-msgstr ""
+msgstr "asgfas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -2612,49 +2755,50 @@ msgstr ""
 #: model:ir.ui.menu,name:account.account_analytic_def_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Analytic Chart of Accounts"
-msgstr ""
+msgstr "Analytisch boekhoudplan"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
 msgid "View Account Analytic Lines"
-msgstr ""
+msgstr "Analytische rekeninglijnen bekijken"
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Select Period and Journal for Validation"
-msgstr ""
+msgstr "Periode en journaal voor validatie kiezen"
 
 #. module: account
 #: field:account.invoice,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "Factuurnummer"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
-msgstr ""
+msgstr "Einde periode"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,finish:0
 msgid "O_k"
-msgstr ""
+msgstr "O_k"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "Onbelast"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 #: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
 msgid "Inverted Analytic Balance"
-msgstr ""
+msgstr "Omgekeerde analytische Balans"
 
 #. module: account
 #: field:account.tax,applicable_type:0
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr ""
+msgstr "Van toepassing zijnde type"
 
 #. module: account
 #: field:account.invoice,reference:0
@@ -2662,13 +2806,17 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0 field:account.account.template,name:0
+#: field:account.account,name:0
+#: field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0 field:account.config.wizard,name:0
-#: field:account.model.line,name:0 field:account.move,name:0
-#: field:account.move.line,name:0 field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0
+#: field:account.config.wizard,name:0
+#: field:account.model.line,name:0
+#: field:account.move,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr ""
@@ -2708,7 +2856,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0 view:account.journal.view:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2801,11 +2950,14 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2826,7 +2978,9 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0 view:product.template:0 view:res.partner:0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
 msgid "Accounting"
 msgstr ""
 
@@ -2859,9 +3013,11 @@ msgstr ""
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr ""
 
@@ -2871,8 +3027,10 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
-#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax,tax_code_id:0
+#: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -2912,12 +3070,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 xsl:account.transfer:0
+#: rml:account.invoice:0
 msgid "Document"
 msgstr ""
 
@@ -2955,7 +3114,8 @@ msgid "Cancel selected invoices"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -2964,6 +3124,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr ""
 
@@ -2978,23 +3140,28 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.tax,base:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,base:0
 msgid "Base"
 msgstr ""
 
@@ -3004,7 +3171,8 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3014,13 +3182,15 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.move:0
+#: view:account.invoice:0
+#: view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr ""
 
 #. module: account
-#: view:account.model:0 field:account.model,legend:0
+#: view:account.model:0
+#: field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3035,14 +3205,17 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0 rml:account.account.balance:0
+#: view:account.account:0
+#: rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0
+#: field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3063,9 +3236,12 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0 view:account.invoice.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr ""
@@ -3078,7 +3254,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3103,15 +3280,21 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0 rml:account.account.balance:0
-#: field:account.account.template,code:0 field:account.account.type,code:0
+#: field:account.account,code:0
+#: rml:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
-#: rml:account.general.journal:0 field:account.journal,code:0
-#: rml:account.partner.balance:0 field:account.period,code:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0
+#: field:account.fiscalyear,code:0
+#: rml:account.general.journal:0
+#: field:account.journal,code:0
+#: rml:account.partner.balance:0
+#: field:account.period,code:0
 msgid "Code"
 msgstr ""
 
@@ -3121,7 +3304,8 @@ msgid "Financial Management"
 msgstr ""
 
 #. module: account
-#: selection:account.account.type,close_method:0 selection:account.tax,type:0
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3133,6 +3317,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr ""
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr ""
@@ -3148,7 +3333,8 @@ msgid "Additionnal Information"
 msgstr ""
 
 #. module: account
-#: field:account.tax,name:0 field:account.tax.template,name:0
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr ""
@@ -3225,7 +3411,8 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3238,7 +3425,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3275,7 +3463,8 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:wizard.company.setup:0
+#: view:account.invoice:0
+#: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3291,7 +3480,8 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr ""
 
@@ -3316,13 +3506,15 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0 view:account.account.type:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3358,7 +3550,8 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3434,7 +3627,8 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0
+#: view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3471,7 +3665,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr ""
@@ -3490,11 +3683,14 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr ""
@@ -3560,7 +3756,8 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0 rml:account.overdue:0
+#: field:account.move.line,date_maturity:0
+#: rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3580,7 +3777,8 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3618,7 +3816,8 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0 field:account.account.template,note:0
+#: field:account.account,note:0
+#: field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3642,7 +3841,8 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Closed"
 msgstr ""
 
@@ -3763,9 +3963,12 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0 field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0 field:account.journal,active:0
-#: field:account.journal.period,active:0 field:account.payment.term,active:0
+#: field:account.account,active:0
+#: field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr ""
@@ -3817,15 +4020,20 @@ msgid "Secondary Currency"
 msgstr ""
 
 #. module: account
-#: field:account.account,credit:0 rml:account.account.balance:0
+#: field:account.account,credit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.journal.period.print:0
-#: field:account.model.line,credit:0 field:account.move.line,credit:0
-#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3856,7 +4064,8 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -3948,15 +4157,18 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0 view:account.fiscalyear:0
+#: field:account.config.wizard,period:0
+#: view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -3969,7 +4181,8 @@ msgid "Periods"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -3996,7 +4209,8 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4050,7 +4264,8 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.central.journal:0
 msgid "Account Name"
 msgstr ""
 
@@ -4141,7 +4356,8 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0 field:account.account.template,type:0
+#: field:account.account,type:0
+#: field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4167,12 +4383,14 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0
+#: field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4193,7 +4411,8 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4211,7 +4430,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4271,12 +4491,14 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0 view:account.period:0
+#: view:account.fiscalyear:0
+#: view:account.period:0
 msgid "States"
 msgstr ""
 
@@ -4312,7 +4534,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
 msgid "Total"
 msgstr ""
 
@@ -4429,9 +4652,11 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0 field:account.journal,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4526,9 +4751,12 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0 field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0
+#: field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4605,7 +4833,8 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4632,7 +4861,8 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4643,7 +4873,8 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4659,7 +4890,8 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 selection:account.bank.statement,state:0
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4674,7 +4906,8 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0 help:account.tax.template,domain:0
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4692,7 +4925,8 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr ""
 
@@ -4702,16 +4936,22 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0 rml:account.account.balance:0
+#: field:account.account,debit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 field:account.model.line,debit:0
-#: field:account.move.line,debit:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.central.journal:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr ""
@@ -4732,6 +4972,7 @@ msgid "Invoice Lines"
 msgstr ""
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr ""
@@ -4773,7 +5014,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4804,7 +5046,8 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0 view:account.invoice:0
+#: view:account.analytic.line:0
+#: view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -4854,12 +5097,14 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0
+#: field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -4900,7 +5145,8 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0 field:account.tax.template,domain:0
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
 msgid "Domain"
 msgstr ""
 
@@ -4925,7 +5171,9 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -4942,7 +5190,8 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr ""
 
@@ -4993,7 +5242,8 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 field:account.invoice,payment_ids:0
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5039,9 +5289,12 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.move,state:0
-#: selection:account.move.line,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.move,state:0
+#: selection:account.move.line,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr ""
@@ -5068,7 +5321,8 @@ msgid "Are you sure ?"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5104,16 +5358,20 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5129,7 +5387,8 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.general.journal:0
+#: rml:account.account.balance:0
+#: rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5152,7 +5411,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5186,7 +5446,6 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5196,7 +5455,8 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0 model:ir.model,name:account.model_account_move
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5207,7 +5467,8 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0 rml:account.account.balance:0
+#: field:account.account,balance:0
+#: rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5215,9 +5476,12 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0 field:account.move.line,balance:0
-#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0 rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: rml:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr ""
@@ -5261,8 +5525,11 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.journal:0 view:account.move:0 view:account.move.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5301,7 +5568,8 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5366,7 +5634,6 @@ msgstr ""
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5394,11 +5661,15 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
-#: field:account.invoice,name:0 field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0
+#: rml:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0 field:account.payment.term,note:0
-#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
+#: rml:account.overdue:0
+#: field:account.payment.term,note:0
+#: field:account.tax.code,info:0
+#: field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5442,7 +5713,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5524,7 +5796,8 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Cash"
 msgstr ""
 
@@ -5564,7 +5837,8 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -5611,8 +5885,10 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5646,8 +5922,10 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0 view:account.payment.term:0
-#: field:account.payment.term,name:0 view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5704,7 +5982,8 @@ msgstr ""
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid "Check this if the user is allowed to reconcile entries in this account."
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
@@ -5729,7 +6008,8 @@ msgid "Accounting Dashboard"
 msgstr ""
 
 #. module: account
-#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
 msgstr ""
 
@@ -5769,18 +6049,212 @@ msgstr ""
 msgid "Aged income"
 msgstr ""
 
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_invoice_created
+#: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
 msgstr ""
 
@@ -5795,12 +6269,12 @@ msgid "Accounts by type"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_aged_receivable
+#: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_account_receivable
+#: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
 msgstr ""
 
@@ -5810,18 +6284,18 @@ msgid "Range"
 msgstr ""
 
 #. module: account
-#: model:ir.module.module,description:account.module_meta_information
+#: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
 msgstr ""
 
 #. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_receivable_graph
-#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
 msgstr ""
 
@@ -5836,7 +6310,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
 msgstr ""
@@ -5845,11 +6319,3 @@ msgstr ""
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
 msgstr ""
-
-#~ msgid ""
-#~ "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 departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Indien dit schrijven uw betaling mocht kruisen, mag u dit negeren. Aarzel "
-#~ "niet om contact op te nemen met onze boekhouding voor eventuele vragen."
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index a7d6841ad73..7a4443baa69 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* account
+#	* account
 #
 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"
-"PO-Revision-Date: 2010-05-30 15:07+0000\n"
+"PO-Revision-Date: 2010-08-01 09:31+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-06-22 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -24,7 +24,7 @@ msgstr "Nazwa wewnętrzna"
 #. module: account
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "Kod podatkowy konta"
+msgstr "Rejestr podatkowy"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree9
@@ -50,7 +50,7 @@ msgstr "Zatwierdź projekt wyciągu"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr "Aktywa"
+msgstr "Własność"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
@@ -92,10 +92,11 @@ msgid "Unreconciled entries"
 msgstr "Zapisy nieuzgodnione"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr "Kod bazowy"
+msgstr "Rejestr podstawy"
 
 #. module: account
 #: view:account.account:0
@@ -124,11 +125,12 @@ msgid "Residual"
 msgstr "Pozostało"
 
 #. module: account
-#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Znak dla rejestru podstawy"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
@@ -188,8 +190,8 @@ msgid "Move line select"
 msgstr "Wybór pozycji zapisów"
 
 #. module: account
-#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0
+#: rml:account.tax.code.entries:0
 msgid "Entry label"
 msgstr "Etykieta zapisu"
 
@@ -204,12 +206,14 @@ msgid "Period Sum"
 msgstr "Suma okresu"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Oblicz kod (jeśli typ = kod)"
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Pozycje zapisów"
 
@@ -226,10 +230,12 @@ msgstr "Zapisy rekurencyjne"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
-#: field:account.invoice.tax,amount:0 field:account.move,amount:0
-#: field:account.tax,amount:0 field:account.tax.template,amount:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.reconcile.line,amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: field:account.move,amount:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
 msgid "Amount"
 msgstr "Kwota"
 
@@ -248,7 +254,7 @@ msgstr "Podatki dostawcy"
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr "Suma Wn"
+msgstr "Suma Winien"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -269,7 +275,8 @@ msgstr ""
 "szybszego wprowadzania w każdym dzienniku."
 
 #. module: account
-#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -283,19 +290,20 @@ msgstr ""
 "teraz i 50% w ciągu miesiąca."
 
 #. module: account
-#: selection:account.tax,type:0 selection:account.tax.template,type:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Stały"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
 msgid "Overdue Payments"
 msgstr "Płatności przeterminowane"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -304,7 +312,8 @@ msgid "Select period"
 msgstr "Wybierz okres"
 
 #. module: account
-#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Pochodzenie"
 
@@ -334,7 +343,9 @@ msgid "Delta Debit"
 msgstr "Przyrost Winien"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice,amount_tax:0
+#: model:account.account.type,name:account.account_type_tax
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Podatek"
@@ -342,23 +353,27 @@ msgstr "Podatek"
 #. module: account
 #: rml:account.general.journal:0
 msgid "Debit Trans."
-msgstr ""
+msgstr "Przen. Winien"
 
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Konto analityczne"
 
 #. module: account
-#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Podatek na podrzędnych"
 
 #. module: account
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Nazwa dziennika"
@@ -426,8 +441,11 @@ msgid "Contra"
 msgstr "Przeciwny"
 
 #. module: account
-#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
-#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
+#: field:account.analytic.account,state:0
+#: field:account.bank.statement,state:0
+#: field:account.invoice,state:0
+#: view:account.move:0
+#: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Stan"
@@ -439,7 +457,8 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Niezapłacone korekty od dostawcy"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Specjalne Obliczenie"
 
@@ -461,8 +480,10 @@ msgid "Disc.(%)"
 msgstr "Up.(%)"
 
 #. module: account
-#: rml:account.general.ledger:0 field:account.model,ref:0
-#: field:account.move,ref:0 rml:account.overdue:0
+#: rml:account.general.ledger:0
+#: field:account.model,ref:0
+#: field:account.move,ref:0
+#: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Odnośnik"
@@ -489,13 +510,13 @@ msgstr "Procesy okresowe"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "Statystyka zapisów analitycznych"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr "Szablony kodów podatkowych"
+msgstr "Szablony rejestrów podatkowych"
 
 #. module: account
 #: view:account.invoice:0
@@ -538,7 +559,7 @@ msgstr "Włącz do wartości bazowej"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Rejestr podstawy dla korekt"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -659,9 +680,13 @@ msgid "Sub-Total :"
 msgstr "Suma częściowa :"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0
+#: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Zapisy analityczne"
 
@@ -676,6 +701,7 @@ msgid "Associated Partner"
 msgstr "Przypisany partner"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Informacje dodatkowe"
@@ -691,11 +717,12 @@ msgid "Select the Period for Analysis"
 msgstr "Wybierz okres do analizy"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr "Znak kodu podatkowego"
+msgstr "Znak dla rejestru podatku"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -723,9 +750,10 @@ msgid "Field Name"
 msgstr "Nazwa pola"
 
 #. module: account
-#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0
+#: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
-msgstr "Znak dla nadrzędnego"
+msgstr "Znak do nadrzędnego"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
@@ -733,7 +761,8 @@ msgid "End of Year Entries Journal"
 msgstr "Dziennik zapisów końca roku"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Purchase Properties"
 msgstr "Właściwości zakupu"
 
@@ -753,9 +782,12 @@ msgid "Move Lines Created."
 msgstr "Utworzono pozycje zapisów."
 
 #. module: account
-#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
-#: field:account.move,state:0 field:account.move.line,state:0
-#: field:account.period,state:0 field:account.subscription,state:0
+#: field:account.fiscalyear,state:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: field:account.subscription,state:0
 msgid "Status"
 msgstr "Stan"
 
@@ -912,8 +944,10 @@ msgstr "Wybierz plan kont"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
-#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Ilość"
@@ -929,7 +963,7 @@ msgstr "Data końcowa"
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr "Kwota kodu podstawowego"
+msgstr "Kwota do rejestru podstawy"
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -950,19 +984,22 @@ msgstr "Zapisy wg wyciągów"
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 msgid "analytic Invoice"
-msgstr ""
+msgstr "Faktura analityczna"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0 rml:account.general.journal:0
+#: view:account.fiscalyear:0
+#: rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0 field:account.move,period_id:0
+#: field:account.journal.period,period_id:0
+#: field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0
+#: view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -984,7 +1021,8 @@ msgid "Net Total:"
 msgstr "Suma netto:"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1016,7 +1054,7 @@ msgstr "Podrzędne"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Fiscal Position Taxes Mapping"
-msgstr "Mapowanie podatków obszarów podatkowych"
+msgstr "Mapowanie podatków wg obszarów podatkowych"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1081,7 +1119,7 @@ msgstr "Wylicz kod dla cen z podatkiem"
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr "Rejestr podatkowy"
+msgstr "Rejestry podatkowe"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
@@ -1108,7 +1146,8 @@ msgid "Fiscal Position Templates"
 msgstr "Szablony obszarów podatkowych"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Cena jedn."
 
@@ -1252,7 +1291,7 @@ msgstr "Kwota stała"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Credit"
-msgstr ""
+msgstr "Analityka Ma"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -1266,7 +1305,8 @@ msgid "Not reconciled transactions"
 msgstr "Nie uzgodnione transakcje"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Mapowanie podatków"
@@ -1288,7 +1328,8 @@ msgid "Write-Off account"
 msgstr "Konto odpisów"
 
 #. module: account
-#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0
+#: field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Model"
 
@@ -1314,9 +1355,11 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Wybierz faktury, które chcesz opłacić i zarządać zaliczkami"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0
+#: field:account.journal,view_id:0
 msgid "View"
 msgstr "Widok"
 
@@ -1352,6 +1395,8 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
+"Jeśli skasujesz uzgodnienie transakcji, to musisz sprawdzić wszystkie akcje "
+"powiązane z tymi transakcjami, ponieważ one nie zostaną zdezaktywowane."
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -1385,7 +1430,8 @@ msgstr "Typy kont"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1401,7 +1447,8 @@ msgid "Journal"
 msgstr "Dziennik"
 
 #. module: account
-#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0
+#: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Konta podrzędne"
 
@@ -1427,7 +1474,8 @@ msgid "Statement reconcile line"
 msgstr "Pozycja uzgodnienia wyciągu"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Pozostaw puste, aby stosować konto dochodowe"
 
@@ -1436,6 +1484,9 @@ msgstr "Pozostaw puste, aby stosować konto dochodowe"
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr "Odpis"
 
@@ -1491,7 +1542,7 @@ msgstr "Tel. :"
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "Kwota do rejestru podatku"
 
 #. module: account
 #: selection:account.account.type,sign:0
@@ -1556,7 +1607,8 @@ msgid "Account n°"
 msgstr "Nr konta"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Zostaw puste żeby używać konta kosztowego"
 
@@ -1566,7 +1618,8 @@ msgid "Account to reconcile"
 msgstr "Konto do uzgodnienia"
 
 #. module: account
-#: rml:account.invoice:0 field:account.model.line,partner_id:0
+#: rml:account.invoice:0
+#: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Odn. partnera"
@@ -1578,12 +1631,14 @@ msgid "Receivable and Payable Accounts"
 msgstr "Konta należności i zobowiązań"
 
 #. module: account
-#: view:account.subscription:0 field:account.subscription,lines_id:0
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Pozycje subskrypcji"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1613,7 +1668,7 @@ msgstr "Termin"
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Third party"
-msgstr ""
+msgstr "Inna firma"
 
 #. module: account
 #: view:account.journal:0
@@ -1709,7 +1764,7 @@ msgstr "Skasuj uzgodnienie zapisów"
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Pre-generated invoice from control"
-msgstr ""
+msgstr "Faktura wygenerowana dla kontroli"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -1747,7 +1802,8 @@ msgid "Period length (days)"
 msgstr "Długość okresu (w dniach)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procentowo"
@@ -1758,7 +1814,8 @@ msgid "Charts"
 msgstr "Plany kont"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1832,9 +1889,11 @@ msgstr "x Dziennik korekt wydatków"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
-#: field:account.journal,type:0 field:account.move,type:0
-#: field:account.move.reconcile,type:0 xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: field:account.journal,type:0
+#: field:account.move,type:0
+#: field:account.move.reconcile,type:0
 msgid "Type"
 msgstr "Typ"
 
@@ -1852,7 +1911,7 @@ msgstr "Kwota bez podatku"
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr "Konto podatkowe faktury"
+msgstr "Konto podatku dla faktur"
 
 #. module: account
 #: view:account.move.line:0
@@ -1982,7 +2041,8 @@ msgid "Journal-Period Name"
 msgstr "Dziennik - nazwa okresu"
 
 #. module: account
-#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Nazwa rejestru"
 
@@ -2000,7 +2060,8 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2048,7 +2109,7 @@ msgstr "Uwaga do obszaru podatkowego :"
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "Okres zapisów otwarcia"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves
@@ -2073,8 +2134,10 @@ msgstr "Przeszłość"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
-#: field:account.journal,currency:0 field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.journal,currency:0
+#: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Waluta"
@@ -2112,7 +2175,8 @@ msgid "Analytic Entry"
 msgstr "Zapis analityczny"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Komunikat przeterminowanych płatności"
 
@@ -2120,7 +2184,7 @@ msgstr "Komunikat przeterminowanych płatności"
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
 msgid "Chart of Taxes"
-msgstr "Schemat podatków"
+msgstr "Struktura ewidencji podatkowej"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -2164,7 +2228,8 @@ msgid "Detail"
 msgstr "Szczegół"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Konsolidacja"
 
@@ -2258,20 +2323,25 @@ msgstr ""
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr "Konto podstawy do deklaracji podatkowej"
+msgstr "Rejestr podstawy podatku"
 
 #. module: account
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0
+#: rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0 field:account.move,date:0
+#: rml:account.journal.period.print:0
+#: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
+#: field:account.subscription.line,date:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Date"
 msgstr "Data"
 
@@ -2287,7 +2357,8 @@ msgid "Unreconcile"
 msgstr "Skasuj uzgodnienie"
 
 #. module: account
-#: field:account.tax,type:0 field:account.tax.template,type:0
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Typ podatku"
 
@@ -2297,7 +2368,8 @@ msgid "Statement Entries"
 msgstr "Zapisy wyciągu"
 
 #. module: account
-#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0
+#: field:account.journal,user_id:0
 msgid "User"
 msgstr "Użytkownik"
 
@@ -2341,7 +2413,7 @@ msgstr "i dzienniki"
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr "Konto podatkowe"
+msgstr "Podatki"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -2387,15 +2459,18 @@ msgid "Date End"
 msgstr "Data końcowa"
 
 #. module: account
-#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0
+#: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
 msgstr "Pozycje zapisu"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Właściwy kod (jeśli typ = kod)"
 
@@ -2420,7 +2495,8 @@ msgstr "Wprowadzanie zapisów wg pozycji"
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
 msgid "List of all the taxes that have to be installed by the wizard"
-msgstr "Lista wszystkich podatków, które mają być zainstalowane przez kreatora"
+msgstr ""
+"Lista wszystkich podatków, które mają być zainstalowane przez kreatora"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2484,9 +2560,11 @@ msgstr "Z analitycznych kont, Utwórz fakturę."
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0
+#: wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0
+#: view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2505,7 +2583,8 @@ msgstr "Z analitycznych kont, Utwórz fakturę."
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -2515,14 +2594,16 @@ msgid "Acc. Type Name"
 msgstr "Nazwa typu konta"
 
 #. module: account
-#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr "Użyj tego kodu do deklaracji VAT."
+msgstr "Użyj tego rejestru do deklaracji VAT."
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -2530,7 +2611,8 @@ msgid "Litigation"
 msgstr "Spór sądowy"
 
 #. module: account
-#: view:account.move.line:0 wizard_view:account.move.validate,init:0
+#: view:account.move.line:0
+#: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Informacja"
@@ -2575,6 +2657,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2599,7 +2683,7 @@ msgstr "Komunikat przeterminowanej płatności"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr "Szablon kodu podatkowego"
+msgstr "Szablon rejestru podatkowego"
 
 #. module: account
 #: rml:account.partner.balance:0
@@ -2615,6 +2699,10 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for deprecated "
 "accounts."
 msgstr ""
+"Ten typ jest stosowany do rozróżnienia typów o specjalnych efektach w "
+"OpenERP: widok nie może mieć zapisów, konsolidacja to konta, które mogą mieć "
+"konta podrzędne do konsolidacji wielofirmowości, zobowiązania/należności są "
+"dla kont partnerów (do obliczeń Winien/Ma), zamknięte dla kont nieczynnych."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
@@ -2629,7 +2717,7 @@ msgstr "Ogólne raporty"
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,power:0
 msgid "Power"
-msgstr ""
+msgstr "Moc"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
@@ -2642,7 +2730,8 @@ msgid "Price"
 msgstr "Cena"
 
 #. module: account
-#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2677,6 +2766,7 @@ msgid "Invoice Number"
 msgstr "Numer faktury"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr "Koniec okresu"
@@ -2695,7 +2785,7 @@ msgstr "Netto"
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 #: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
 msgid "Inverted Analytic Balance"
-msgstr ""
+msgstr "Odwrotny bilans analityczny"
 
 #. module: account
 #: field:account.tax,applicable_type:0
@@ -2709,13 +2799,17 @@ msgid "Invoice Reference"
 msgstr "Odnośnik faktury"
 
 #. module: account
-#: field:account.account,name:0 field:account.account.template,name:0
+#: field:account.account,name:0
+#: field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0 field:account.config.wizard,name:0
-#: field:account.model.line,name:0 field:account.move,name:0
-#: field:account.move.line,name:0 field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0
+#: field:account.config.wizard,name:0
+#: field:account.model.line,name:0
+#: field:account.move,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nazwa"
@@ -2758,7 +2852,8 @@ msgstr ""
 "wieloma podrzędnymi. W takim przypadku kolejność obliczeń ma znaczenie."
 
 #. module: account
-#: field:account.journal.column,view_id:0 view:account.journal.view:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2838,7 +2933,7 @@ msgstr "Pomiń stan 'Projekt' dla tworzonych zapisów"
 #: field:account.invoice.tax,account_id:0
 #: field:account.move.line,tax_code_id:0
 msgid "Tax Account"
-msgstr "Konto Podatkowe"
+msgstr "Konto/rejestr podatkowy"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
@@ -2851,11 +2946,14 @@ msgid "Full Account Name"
 msgstr "Pełna nazwa konta"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2876,7 +2974,9 @@ msgid "Document: Customer account statement"
 msgstr "Dokument: Zestawienie kont klienta"
 
 #. module: account
-#: view:product.product:0 view:product.template:0 view:res.partner:0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
 msgid "Accounting"
 msgstr "Księgowość"
 
@@ -2909,9 +3009,11 @@ msgstr "Pozycje zapisu"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr "Uzgodnienie"
 
@@ -2921,11 +3023,13 @@ msgid "Centralisation"
 msgstr "Centralizacja"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
-#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax,tax_code_id:0
+#: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr "Kod podatku"
+msgstr "Rejestr podatku"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2965,12 +3069,13 @@ msgstr ""
 "warunków płatności partnera."
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Situation"
 msgstr "Sytuacja"
 
 #. module: account
-#: rml:account.invoice:0 xsl:account.transfer:0
+#: rml:account.invoice:0
 msgid "Document"
 msgstr "Dokument"
 
@@ -3010,7 +3115,8 @@ msgid "Cancel selected invoices"
 msgstr "Anuluj zaznaczone faktury"
 
 #. module: account
-#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3019,6 +3125,8 @@ msgstr "Dziennik analityczny"
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr "Etykieta zapisu"
 
@@ -3033,23 +3141,28 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Ustaw na projekt"
 
 #. module: account
-#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Oznaczenie dokumentu, z którego utworzono tę fakturę."
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Zobowiązania"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.tax,base:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Baza"
 
@@ -3059,7 +3172,8 @@ msgid "Model Name"
 msgstr "Nazwa modelu"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Others"
 msgstr "Inne"
 
@@ -3069,13 +3183,15 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0 view:account.move:0
+#: view:account.invoice:0
+#: view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Zatwierdź"
 
 #. module: account
-#: view:account.model:0 field:account.model,legend:0
+#: view:account.model:0
+#: field:account.model,legend:0
 msgid "Legend"
 msgstr "Legenda"
 
@@ -3090,14 +3206,17 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0 rml:account.account.balance:0
+#: view:account.account:0
+#: rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0
+#: field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3118,9 +3237,12 @@ msgid "By Date and Period"
 msgstr "Wg daty i okresu"
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0 view:account.invoice.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Uwagi"
@@ -3133,7 +3255,8 @@ msgid ""
 msgstr "Zapisy konta dla faktury zostały uzgodnione z zapisami płatności."
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3158,15 +3281,21 @@ msgid "Statement encoding produces payment entries"
 msgstr "Wprowadzenie wyciągu generuje zapisy płatności"
 
 #. module: account
-#: field:account.account,code:0 rml:account.account.balance:0
-#: field:account.account.template,code:0 field:account.account.type,code:0
+#: field:account.account,code:0
+#: rml:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
-#: rml:account.general.journal:0 field:account.journal,code:0
-#: rml:account.partner.balance:0 field:account.period,code:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0
+#: field:account.fiscalyear,code:0
+#: rml:account.general.journal:0
+#: field:account.journal,code:0
+#: rml:account.partner.balance:0
+#: field:account.period,code:0
 msgid "Code"
 msgstr "Kod"
 
@@ -3176,7 +3305,8 @@ msgid "Financial Management"
 msgstr "Księgowość"
 
 #. module: account
-#: selection:account.account.type,close_method:0 selection:account.tax,type:0
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Brak"
@@ -3188,6 +3318,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr "Generuj zapisy otwarcia roku podatkowego"
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr "Uzgodnij zapisy"
@@ -3203,7 +3334,8 @@ msgid "Additionnal Information"
 msgstr "Dodatkowe informacje"
 
 #. module: account
-#: field:account.tax,name:0 field:account.tax.template,name:0
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Nazwa podatku"
@@ -3221,7 +3353,7 @@ msgstr "30 dni od końca miesiąca"
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr "Główny kod podatkowy"
+msgstr "Główny rejestr podatkowy"
 
 #. module: account
 #: constraint:account.invoice:0
@@ -3243,7 +3375,7 @@ msgstr "Zapis"
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "Źródło podatku"
+msgstr "Podatek źródłowy"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
@@ -3280,9 +3412,10 @@ msgid "Partner Balance"
 msgstr "Saldo partnera"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
-msgstr ""
+msgstr "Rejestr firmy"
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
@@ -3295,7 +3428,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3334,7 +3468,8 @@ msgid "Import invoice"
 msgstr "Importuj fakturę"
 
 #. module: account
-#: view:account.invoice:0 view:wizard.company.setup:0
+#: view:account.invoice:0
+#: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Utwórz"
@@ -3350,7 +3485,8 @@ msgid "Invoice line"
 msgstr "Pozycja faktury"
 
 #. module: account
-#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Skrót"
 
@@ -3377,13 +3513,15 @@ msgid ""
 msgstr "Wartość wyrażona w drugiej walucie, jeśli zapis jest wielowalutowy."
 
 #. module: account
-#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr "Nadrzędne konto podatkowe"
+msgstr "Podatek nadrzędny"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0 view:account.account.type:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3419,7 +3557,8 @@ msgid "Central Journal"
 msgstr "Konta dziennika"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Saldo z przeniesienia"
 
@@ -3495,7 +3634,8 @@ msgid "Journal code"
 msgstr "Kod dziennika"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0
+#: view:account.model:0
 msgid "Create entries"
 msgstr "Utwórz zapisy"
 
@@ -3533,7 +3673,6 @@ msgstr ""
 "Te warunki płatności będą stosowane zamiast domyślnych dla bieżącego partnera"
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr "Nazwa zapisu"
@@ -3550,15 +3689,18 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
-"Zaznacz tę opcję, jeśli nie chcesz, aby jakikolwiek VAT związany z tym kodem "
-"podatkowym pojawił się na fakturach."
+"Zaznacz tę opcję, jeśli nie chcesz, aby jakikolwiek VAT związany z tym "
+"rejestrem podatkowym pojawił się na fakturach."
 
 #. module: account
-#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Numeracja"
@@ -3577,7 +3719,7 @@ msgstr "Wprowadzanie zapisów"
 #: wizard_view:account.invoice.refund,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_refund
 msgid "Credit Note"
-msgstr "Nota kredytowa"
+msgstr "Korekta"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
@@ -3626,7 +3768,8 @@ msgstr "Konto subskrypcji"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0 rml:account.overdue:0
+#: field:account.move.line,date_maturity:0
+#: rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Data zapłaty"
 
@@ -3646,7 +3789,8 @@ msgid "Account Configure Wizard "
 msgstr "Kreator konfiguracji konta "
 
 #. module: account
-#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Data początkowa"
@@ -3671,7 +3815,7 @@ msgstr "Projekty faktur"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Fiscal Position Template Tax Mapping"
-msgstr "Mapowanie szablonów podatków obszarów podatkowych"
+msgstr "Mapowanie podatków wg szablonów obszarów podatkowych"
 
 #. module: account
 #: rml:account.invoice:0
@@ -3684,7 +3828,8 @@ msgid "Unreconciled"
 msgstr "Skasowano uzgodnienie"
 
 #. module: account
-#: field:account.account,note:0 field:account.account.template,note:0
+#: field:account.account,note:0
+#: field:account.account.template,note:0
 msgid "Note"
 msgstr "Uwaga"
 
@@ -3717,7 +3862,8 @@ msgid "Entry Sequence"
 msgstr "Numeracja zapisów"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Zamknięte"
 
@@ -3729,7 +3875,7 @@ msgstr "Zapisy płatności"
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or tax code account."
-msgstr ""
+msgstr "To może być rejestr podatku lub podstawy podatku."
 
 #. module: account
 #: help:account.automatic.reconcile,init,account_ids:0
@@ -3845,9 +3991,12 @@ msgid "Code/Date"
 msgstr "Kod/Data"
 
 #. module: account
-#: field:account.account,active:0 field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0 field:account.journal,active:0
-#: field:account.journal.period,active:0 field:account.payment.term,active:0
+#: field:account.account,active:0
+#: field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktywne"
@@ -3899,15 +4048,20 @@ msgid "Secondary Currency"
 msgstr "Waluta dodatkowa"
 
 #. module: account
-#: field:account.account,credit:0 rml:account.account.balance:0
+#: field:account.account,credit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.journal.period.print:0
-#: field:account.model.line,credit:0 field:account.move.line,credit:0
-#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3926,13 +4080,13 @@ msgstr ""
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Konto zwrotów podatku"
+msgstr "Konto podatku dla korekt"
 
 #. module: account
 #: field:account.tax.code,child_ids:0
 #: field:account.tax.code.template,child_ids:0
 msgid "Child Codes"
-msgstr "Kody podrzędne"
+msgstr "Rejestry podrzędne"
 
 #. module: account
 #: field:account.invoice,move_name:0
@@ -3940,14 +4094,15 @@ msgid "Account Move"
 msgstr "Zapis konta"
 
 #. module: account
-#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Pozycje wyciągu"
 
 #. module: account
 #: field:account.move.line,amount_taxed:0
 msgid "Taxed Amount"
-msgstr "Kwota opodatkowana"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
@@ -4037,15 +4192,18 @@ msgid "Journal Column"
 msgstr "Kolumna dziennika"
 
 #. module: account
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Wykonano"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0 view:account.fiscalyear:0
+#: field:account.config.wizard,period:0
+#: view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4058,7 +4216,8 @@ msgid "Periods"
 msgstr "Okresy"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4085,7 +4244,8 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr "Koszt analityczny do refakturowania zakupów, kart pracy, ..."
 
 #. module: account
-#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Domyślne podatki"
 
@@ -4124,7 +4284,7 @@ msgstr ""
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Third party (Country)"
-msgstr ""
+msgstr "Inna firma (kraj)"
 
 #. module: account
 #: field:account.account,parent_left:0
@@ -4139,12 +4299,13 @@ msgstr "Numeracja ustala porządek wyświetlania listy dzienników"
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr ""
+msgstr "Kontrole typów"
 
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Nazwa konta"
 
@@ -4235,7 +4396,8 @@ msgid "Import file from your bank statement"
 msgstr "Importuj plik wyciągu bankowego"
 
 #. module: account
-#: field:account.account,type:0 field:account.account.template,type:0
+#: field:account.account,type:0
+#: field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Typ wewnętrzny"
 
@@ -4261,12 +4423,14 @@ msgid "Posted"
 msgstr "Zaksięgowano"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr "Nota kredytowa"
+msgstr "Korekty"
 
 #. module: account
-#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0
+#: field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Data końcowa"
 
@@ -4287,7 +4451,8 @@ msgid "Day of the Month"
 msgstr "Dzień miesiąca"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Pozycje"
 
@@ -4303,15 +4468,12 @@ msgid ""
 "to the higher ones. The order is important if you have a tax with several "
 "tax children. In this case, the evaluation order is important."
 msgstr ""
-"Pole numeracji jest stosowane do porządkowania pozycji podatków od numeru "
-"najniższego do najwyższego. Kolejność jest istotna jeśli są podatki z "
-"kilkoma podatkami podrzędnymi. W takim przypadku ważna jest kolejność "
-"obliczania."
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Declaration"
-msgstr "Deklaracja podatkowa"
+msgstr "Rejestry podatkowe"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -4331,7 +4493,7 @@ msgstr "Pozycja modelu zapisu"
 #. module: account
 #: view:account.tax.template:0
 msgid "Account Tax Template"
-msgstr "Szablon konta podatkowego"
+msgstr "Szablon podatku"
 
 #. module: account
 #: help:account.model,name:0
@@ -4356,7 +4518,7 @@ msgstr "Jesteś pewna(wien), że chcesz otworzyć tę fakturę ?"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 msgid "Partner Other Ledger"
-msgstr ""
+msgstr "Rejestr innego partnera"
 
 #. module: account
 #: view:res.partner:0
@@ -4369,12 +4531,14 @@ msgid "The optional quantity on entries"
 msgstr "Opcjonalne ilości na zapisach"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "JNRL"
-msgstr ""
+msgstr "DZ"
 
 #. module: account
-#: view:account.fiscalyear:0 view:account.period:0
+#: view:account.fiscalyear:0
+#: view:account.period:0
 msgid "States"
 msgstr "Stany"
 
@@ -4410,7 +4574,8 @@ msgstr "Data rozpoczęcia"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Suma"
 
@@ -4529,9 +4694,11 @@ msgstr "Ważne zapisy z faktury"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0 field:account.journal,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4628,9 +4795,12 @@ msgid "Print Aged Trial Balance"
 msgstr "Drukuj bilans próbny wiekowania"
 
 #. module: account
-#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0 field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0
+#: field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Odn."
 
@@ -4710,7 +4880,8 @@ msgid "Control Invoice"
 msgstr "Sprawdź fakturę"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Należności"
@@ -4737,7 +4908,8 @@ msgstr "VAT:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Suma:"
@@ -4748,7 +4920,8 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Mapowanie konta"
@@ -4764,7 +4937,8 @@ msgid "Account Reconciliation"
 msgstr "Uzgodnienie konta"
 
 #. module: account
-#: view:account.bank.statement:0 selection:account.bank.statement,state:0
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Potwierdź"
 
@@ -4779,7 +4953,8 @@ msgid "Parent Account Template"
 msgstr "Szablon konta nadrzędnego"
 
 #. module: account
-#: help:account.tax,domain:0 help:account.tax.template,domain:0
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4799,7 +4974,8 @@ msgid "Analytic account"
 msgstr "Konto analityczne"
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Faktura od dostawcy"
 
@@ -4809,16 +4985,22 @@ msgid "Valid"
 msgstr "Ważna"
 
 #. module: account
-#: field:account.account,debit:0 rml:account.account.balance:0
+#: field:account.account,debit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 field:account.model.line,debit:0
-#: field:account.move.line,debit:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.central.journal:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Winien"
@@ -4839,6 +5021,7 @@ msgid "Invoice Lines"
 msgstr "Pozycje faktury"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr "Początek okresu"
@@ -4857,12 +5040,12 @@ msgstr "Utwórz zapisy"
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr "Kod zwrotu podatku"
+msgstr "Rejestr podatku w korektach"
 
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr "Opis podatku"
+msgstr "Podatek"
 
 #. module: account
 #: help:account.invoice,move_id:0
@@ -4880,7 +5063,8 @@ msgid "Reporting"
 msgstr "Raportowanie"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4911,7 +5095,8 @@ msgid "Configuration"
 msgstr "Konfiguracja"
 
 #. module: account
-#: view:account.analytic.line:0 view:account.invoice:0
+#: view:account.analytic.line:0
+#: view:account.invoice:0
 msgid "Total amount"
 msgstr "Suma kwot"
 
@@ -4952,7 +5137,7 @@ msgstr "Wybierz datę-okres"
 #. module: account
 #: rml:account.analytic.account.inverted.balance:0
 msgid "Inverted Analytic Balance -"
-msgstr ""
+msgstr "Odwrotny bilans analityczny"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -4961,12 +5146,14 @@ msgid "Paid invoice"
 msgstr "Faktura zapłacona"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Definicja podatku"
 
 #. module: account
-#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0
+#: field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Grupa podatku"
 
@@ -4995,7 +5182,7 @@ msgstr "Importuj faktury"
 #: wizard_view:account.move.line.unreconcile.select,init:0
 #: wizard_view:account.reconcile.unreconcile,init:0
 msgid "Unreconciliation"
-msgstr ""
+msgstr "Kasowanie uzgodnień"
 
 #. module: account
 #: model:ir.model,name:account.model_fiscalyear_seq
@@ -5009,7 +5196,8 @@ msgid "With movements"
 msgstr "Ze zmianami stanu"
 
 #. module: account
-#: field:account.tax,domain:0 field:account.tax.template,domain:0
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domena"
 
@@ -5021,7 +5209,7 @@ msgstr "Dane konta"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr "Szablon kodu konta podatkowego"
+msgstr "Szablon rejestru konta podatkowego"
 
 #. module: account
 #: view:account.subscription:0
@@ -5034,7 +5222,9 @@ msgid "Manually"
 msgstr "Ręcznie"
 
 #. module: account
-#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5051,7 +5241,8 @@ msgid "Payable Accounts"
 msgstr "Konta zobowiązań"
 
 #. module: account
-#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Pozycja faktury"
 
@@ -5079,7 +5270,7 @@ msgstr "Potwierdzenie gotówki"
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr "Podatek zamienny"
+msgstr "Podatek docelowy"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
@@ -5089,7 +5280,7 @@ msgstr "Ręcznie wprowadzony wyciąg jest projektem wyciągu"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
 msgid "This Month"
-msgstr "W tym miesiącu"
+msgstr "Bieżący miesiąc"
 
 #. module: account
 #: field:account.account.type,sign:0
@@ -5102,7 +5293,8 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "Ewnetualna druga waluta jeśli ten zapis jest wielowalutowy."
 
 #. module: account
-#: view:account.invoice:0 field:account.invoice,payment_ids:0
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Płatności"
@@ -5130,7 +5322,7 @@ msgstr "Wszystkie zapisy konta"
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
 msgid "The tax basis of the tax declaration."
-msgstr "Podatek bazowy deklaracji podatkowej"
+msgstr "Rejestr podstawy podatku do ewidencji podatkowej."
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -5148,9 +5340,12 @@ msgstr "Wybierz dziennik i datę płatności"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.move,state:0
-#: selection:account.move.line,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.move,state:0
+#: selection:account.move.line,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Projekt"
@@ -5177,7 +5372,8 @@ msgid "Are you sure ?"
 msgstr "Na pewno?"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -5194,7 +5390,7 @@ msgstr "Wyciąg bankowy zastosowany do uzgodnień bankowych"
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Fiscalyear"
-msgstr ""
+msgstr "Rok podatkowy"
 
 #. module: account
 #: wizard_button:account.analytic.line,init,open:0
@@ -5213,16 +5409,20 @@ msgid "Supplier Invoice Process"
 msgstr "Proces faktury dostawcy"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Strona"
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Optional Information"
 msgstr "Informacje dodatkowe"
 
@@ -5238,7 +5438,8 @@ msgid "Receivable and Payable"
 msgstr "Należności i zobowiązania"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.general.journal:0
+#: rml:account.account.balance:0
+#: rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5259,9 +5460,13 @@ msgid ""
 "amount.If the tax account is base tax code,                    this field "
 "will contain the basic amount(without tax)."
 msgstr ""
+"Jeśli konto/rejestr podatkowy jest rejestrem podatku, to pole będzie "
+"zawierało kwotę podatku. Jeśli konto/rejestr podatkowy jest rejestrem "
+"podstawy, to pole zawiera wartość bazową (bez podatku)."
 
 #. module: account
-#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Oblicz"
@@ -5295,7 +5500,6 @@ msgstr "Liczba okresów"
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5305,7 +5509,8 @@ msgid "End of period"
 msgstr "Koniec okresu"
 
 #. module: account
-#: view:account.move:0 model:ir.model,name:account.model_account_move
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Zapis na koncie"
 
@@ -5316,7 +5521,8 @@ msgid "General Journal"
 msgstr "Stany dzienników"
 
 #. module: account
-#: field:account.account,balance:0 rml:account.account.balance:0
+#: field:account.account,balance:0
+#: rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5324,9 +5530,12 @@ msgstr "Stany dzienników"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0 field:account.move.line,balance:0
-#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0 rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: rml:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Saldo"
@@ -5372,8 +5581,11 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "Numeracja stosowana dla numerów faktur w tym dzienniku"
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.journal:0 view:account.move:0 view:account.move.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "General Information"
 msgstr "Informacje ogólne"
 
@@ -5415,7 +5627,8 @@ msgid "List of Accounts"
 msgstr "Lista kont"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Sales Properties"
 msgstr "Właściwości sprzedaży"
 
@@ -5459,7 +5672,7 @@ msgstr "Zapisy otwartych dzienników analitycznych"
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Manual Invoice Taxes"
-msgstr "Podatki ręcznych faktur"
+msgstr "Ręczne podatki faktur"
 
 #. module: account
 #: field:account.model.line,date:0
@@ -5480,7 +5693,6 @@ msgstr "Rok podatkowy do zamknięcia"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5508,11 +5720,15 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
-#: field:account.invoice,name:0 field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0
+#: rml:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0 field:account.payment.term,note:0
-#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
+#: rml:account.overdue:0
+#: field:account.payment.term,note:0
+#: field:account.tax.code,info:0
+#: field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Opis"
 
@@ -5528,7 +5744,7 @@ msgstr ""
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr "Konta podatków podrzędnych"
+msgstr "Podatki podrzędne"
 
 #. module: account
 #: field:account.account,parent_right:0
@@ -5560,7 +5776,8 @@ msgstr ""
 "tego partnera"
 
 #. module: account
-#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Kod rejestru"
 
@@ -5589,7 +5806,7 @@ msgstr "Bilans analityczny -"
 #: wizard_field:account_use_models,init_form,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr ""
+msgstr "Model konta"
 
 #. module: account
 #: view:account.invoice:0
@@ -5641,7 +5858,9 @@ msgid "Models Definition"
 msgstr "Definicje modeli"
 
 #. module: account
-#: selection:account.balance.account.balance.report,init,compare_pattern:0
+#: model:account.account.type,name:account.account_type_cash_moves
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Cash"
 msgstr "Gotówka"
 
@@ -5649,7 +5868,7 @@ msgstr "Gotówka"
 #: field:account.fiscal.position.account,account_dest_id:0
 #: field:account.fiscal.position.account.template,account_dest_id:0
 msgid "Account Destination"
-msgstr ""
+msgstr "Konto docelowe"
 
 #. module: account
 #: rml:account.overdue:0
@@ -5678,10 +5897,11 @@ msgstr "Przyszłość"
 #: help:account.partner.balance.report,init,fiscalyear:0
 #: help:account.third_party_ledger.report,init,fiscalyear:0
 msgid "Keep empty for all open fiscal year"
-msgstr ""
+msgstr "Pozostaw puste dla wszystkich otwartych lat podatkowych"
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Korekta od dostawcy"
 
@@ -5708,7 +5928,7 @@ msgstr "Faktura zapłacona przy uzgadnianiu"
 #: field:account.tax,python_compute_inv:0
 #: field:account.tax.template,python_compute_inv:0
 msgid "Python Code (reverse)"
-msgstr ""
+msgstr "Kod Pythona (reverse)"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -5726,10 +5946,14 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category"
 msgstr ""
+"To konto będzie stosowane do rejestrowania wartości zapasów wychodzących "
+"przy sprzedaży dla bieżącej kategorii produktów"
 
 #. module: account
-#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5745,7 +5969,7 @@ msgstr "Szczegóły banku"
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr ""
+msgstr "Konto wydatków dla szablonu produktu"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -5763,8 +5987,10 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Nazwa roku podatkowego wyświetlana na ekranie"
 
 #. module: account
-#: field:account.invoice,payment_term:0 view:account.payment.term:0
-#: field:account.payment.term,name:0 view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5822,7 +6048,8 @@ msgstr "Tak"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid "Check this if the user is allowed to reconcile entries in this account."
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Zaznacz tę opcję, jeśli chcesz, aby użytkownik miał prawo uzgadniać zapisy "
 "tego konta."
@@ -5849,7 +6076,8 @@ msgid "Accounting Dashboard"
 msgstr "Konsola księgowości"
 
 #. module: account
-#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
 msgstr "Konta do faktur"
 
@@ -5872,7 +6100,7 @@ msgstr "Konsola dla księgowści"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr "Konta przychodowe"
+msgstr "Konta dochodowe"
 
 #. module: account
 #: view:board.board:0
@@ -5908,7 +6136,7 @@ msgstr "Wybór zapisów wg"
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr "Powiadamianie"
+msgstr "Powiadomienia"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
@@ -5949,7 +6177,7 @@ msgstr "Wybierz konto referencyjne (do porównania %)"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr "Saldo konta - Porównanie lat"
+msgstr "Bilans - Porównanie lat"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -5972,6 +6200,22 @@ msgid ""
 "    5. You have an option to print the desired report in Landscape format.\n"
 "    "
 msgstr ""
+"Moduł bilansu jest dodatkową funkcjonalnością modułu księgowego.\n"
+"\n"
+"    Ten moduł daje kilka opcji drukowania bilansu.\n"
+"\n"
+"    1. Możesz porównać bilanse z różnych lat.\n"
+"\n"
+"    2. Możesz ustawić liczbowo lub procentowo porównanie pomiędzy dwoma "
+"latami.\n"
+"\n"
+"    3. Możesz ustawić konto referencyjne do procentowego porównania "
+"poszczególnych lat.\n"
+"\n"
+"    4. Możesz wybrać okres jako datę bieżącą lub jako datę utworzenia.\n"
+"\n"
+"    5. Możesz drukować raporty w formacie poziomym.\n"
+"    "
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -5987,7 +6231,7 @@ msgstr "Pokaż raport w poziomie"
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Suma :"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
@@ -5995,7 +6239,7 @@ msgid "Show Comparision in %"
 msgstr "Pokaż porównanie w %"
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
 msgstr "Wybierz okres"
 
@@ -6022,13 +6266,13 @@ msgstr "1. Wybrałeś więcej niż 3 lata w którymś przypadku."
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "Księgowość - Porównanie kont"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Rok :"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6054,7 +6298,7 @@ msgstr ""
 #. module: account
 #: help:account.balance.account.balance.report,init,select_account:0
 msgid "Keep empty for comparision to its parent"
-msgstr "Pozostaw puste do porównania z nadrzędnymi."
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
@@ -6071,9 +6315,9 @@ msgstr "2. Nie wybrałeś opcji 'Procentowo', ale wybrałeś więcej niż 2 lata
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid ""
-"You may have selected the compare options with more than 1 year with credit/"
-"debit columns and % option.This can lead contents to be printed out of the "
-"paper.Please try again."
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
 msgstr ""
 "Pewnie wybrałaś(eś) opcję porównania z więcej niż 1 rokiem z kolumnami "
 "Winien/Ma i opcją %. To prowadzi do wydruku poza papierem. Spróbuj ponownie."
@@ -6091,17 +6335,17 @@ msgstr "Dostosuj raport"
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Zakres miesięcy"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Faktury utworzone w ostatnich 15. dniach."
 
 #. module: account
-#: model:ir.model,name:account.model_report_invoice_created
+#: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Raport faktur z ostatnich 15. miesięcy."
 
 #. module: account
 #: view:report.invoice.created:0
@@ -6114,12 +6358,12 @@ msgid "Accounts by type"
 msgstr "Konta wg typu"
 
 #. module: account
-#: model:ir.model,name:account.model_report_aged_receivable
+#: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Wiekowane należności do dzisiaj"
 
 #. module: account
-#: model:ir.model,name:account.model_report_account_receivable
+#: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
 msgstr "Konta należności"
 
@@ -6129,18 +6373,18 @@ msgid "Range"
 msgstr "Zakres"
 
 #. module: account
-#: model:ir.module.module,description:account.module_meta_information
+#: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
 msgstr "Moduł dodający nowe raporty dla księgowości"
 
 #. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
 msgstr "Kisęgowość - Raportowanie"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_receivable_graph
-#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
 msgstr "Bilans wg typów kont"
 
@@ -6155,12 +6399,320 @@ msgid "Create Date"
 msgstr "Data utworzenia"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr "Przeterminowane należności"
+msgstr "Wiekowane należności"
 
 #. module: account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
 msgstr "Kwota bez podatku"
+
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "Błąd integracji !"
+
+#, python-format
+#~ msgid "No Period found on Invoice!"
+#~ msgstr "Brak okresu w fakturze !"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Ostrzeżenie !"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "Brak dziennika analitycznego !"
+
+#, python-format
+#~ msgid "No period found !"
+#~ msgstr "Brak okresu !"
+
+#, python-format
+#~ msgid "Bank Journal "
+#~ msgstr "Dziennik banku "
+
+#, python-format
+#~ msgid "You can not add/modify entries in a closed journal."
+#~ msgstr "Nie możesz dodawać lub modyfikować zapisów w zamkniętym dzienniku."
+
+#, python-format
+#~ msgid "You must first select a partner !"
+#~ msgstr "Musisz najpierw wybrać partnera"
+
+#, python-format
+#~ msgid "The opening journal must not have any entry in the new fiscal year !"
+#~ msgstr ""
+#~ "Otwierany dziennik nie może zawierać zapisów w nowym roku fiskalnym !"
+
+#, python-format
+#~ msgid "No Data Available"
+#~ msgstr "Brak daty"
+
+#, python-format
+#~ msgid "You must select accounts to reconcile"
+#~ msgstr "Musisz wybrać konta do uzgodnienia"
+
+#, python-format
+#~ msgid "Purchase Journal"
+#~ msgstr "Dziennik zakupów"
+
+#, python-format
+#~ msgid "No Partner Defined !"
+#~ msgstr "Nie zdefiniowano partnera !"
+
+#, python-format
+#~ msgid "Invalid action !"
+#~ msgstr "Niedozwolona akcja !"
+
+#, python-format
+#~ msgid "No sequence defined in the journal !"
+#~ msgstr "Brak sekwencji dla dziennika !"
+
+#, python-format
+#~ msgid "Some entries are already reconciled !"
+#~ msgstr "Niektóre zapisy są już uzgodnione"
+
+#, python-format
+#~ msgid "No Analytic Journal !"
+#~ msgstr "Brak dziennika analitycznego !"
+
+#, python-format
+#~ msgid "Already Reconciled"
+#~ msgstr "Już uzgodnione"
+
+#, python-format
+#~ msgid "Unable to change tax !"
+#~ msgstr "Nie można zmienić podatku !"
+
+#, python-format
+#~ msgid ""
+#~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+#~ "defined !"
+#~ msgstr "W warunkach płatności dostawcy nie wporwadzono pozycji !"
+
+#, python-format
+#~ msgid "No records found for your selection!"
+#~ msgstr "Nie znaleziono rekordu dla twojej selekcji!"
+
+#, python-format
+#~ msgid "Unable to reconcile entry \"%s\": %.2f"
+#~ msgstr "Nie można uzgodnić zapisu \"%s\": %.2f"
+
+#, python-format
+#~ msgid "Sales Journal"
+#~ msgstr "Dziennik sprzedaży"
+
+#, python-format
+#~ msgid "You can not modify/delete a journal with entries for this period !"
+#~ msgstr "Nie mozesz modyfikować/usuwać dziennika z zapisami dla tego okresu !"
+
+#, python-format
+#~ msgid "Invoice is already reconciled"
+#~ msgstr "Faktura jest już uzgodniona"
+
+#, python-format
+#~ msgid "Entries: "
+#~ msgstr "Zapisy: "
+
+#, python-format
+#~ msgid "You can not change the tax, you should remove and recreate lines !"
+#~ msgstr ""
+#~ "Nie możesz zmieniać podatku. Powinnaś(nieneś) usunąć pozycję i utworzyć nową "
+#~ "!"
+
+#, python-format
+#~ msgid "Entry \"%s\" is not valid !"
+#~ msgstr "Zapis \"%s\" jest niedozwolony !"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Błąd !"
+
+#, python-format
+#~ msgid "End of Fiscal Year Entry"
+#~ msgstr "Zapis końca roku podatkowego"
+
+#, python-format
+#~ msgid "Data Insufficient !"
+#~ msgstr "Zbyt mało danych !"
+
+#, python-format
+#~ msgid "Date not in a defined fiscal year"
+#~ msgstr "Data poza rokiem podatkowym"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Ostrzeżenie"
+
+#, python-format
+#~ msgid "Please verify that an account is defined in the journal."
+#~ msgstr "Sprawdź, czy konto jest zdefiniowane w dzienniku."
+
+#, python-format
+#~ msgid "Entry is already reconciled"
+#~ msgstr "Zapis jest już uzgodniony"
+
+#, python-format
+#~ msgid "This period is already closed !"
+#~ msgstr "Ten okres jest już zamknięty !"
+
+#, python-format
+#~ msgid "You must define an analytic journal of type '%s' !"
+#~ msgstr "Musisz zdefiniować dziennik analityczny typu '%s' !"
+
+#, python-format
+#~ msgid "Bad account!"
+#~ msgstr "Złe konto!"
+
+#, python-format
+#~ msgid "Standard Encoding"
+#~ msgstr "Wprowadzanie standardowe"
+
+#, python-format
+#~ msgid "Bad account !"
+#~ msgstr "Złe konto !"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Błąd"
+
+#, python-format
+#~ msgid "Taxes missing !"
+#~ msgstr "Brak podatków !"
+
+#, python-format
+#~ msgid "You have to define an analytic journal on the '%s' journal!"
+#~ msgstr "Musisz zdefiniować dziennik analityczny dla dziennika '%s' !"
+
+#, python-format
+#~ msgid "Cannot delete invoice(s) that are already opened or paid !"
+#~ msgstr "Nie można usuwać faktur już otwartych lub zapłaconych !"
+
+#, python-format
+#~ msgid "You can not delete posted movement: \"%s\"!"
+#~ msgstr "Nie możesz usunąć zaksięgowanych zmian: \"%s\"!"
+
+#, python-format
+#~ msgid "Free Reference"
+#~ msgstr "Odnośnik"
+
+#, python-format
+#~ msgid "Can not %s draft/proforma/cancel invoice."
+#~ msgstr "Nie można %s faktury projektowanej/proforma/anulowanej."
+
+#, python-format
+#~ msgid "Can not pay draft/proforma/cancel invoice."
+#~ msgstr "Nie można zapłacić faktur projektowanych/proforma/anulowanych."
+
+#, python-format
+#~ msgid "No journal for ending writing has been defined for the fiscal year"
+#~ msgstr ""
+#~ "Nie został zdefiniowany dziennik dla zapisów końcowych dla roku podatkowego"
+
+#, python-format
+#~ msgid "You have to provide an account for the write off entry !"
+#~ msgstr "Musisz podać konto dla zapisu odpisu !"
+
+#, python-format
+#~ msgid "Entries are not of the same account or already reconciled ! "
+#~ msgstr "Zapisy nie są z tego samego konta lub zostały już uzgodnione ! "
+
+#, python-format
+#~ msgid "Your journal must have a default credit and debit account."
+#~ msgstr "Twój dziennik musi mieć domyślne konto Winien i Ma."
+
+#, python-format
+#~ msgid "The journal must have default credit and debit account"
+#~ msgstr "Dziennik musi mieć domyślne konto Winien i Ma."
+
+#, python-format
+#~ msgid "The account entries lines are not in valid state."
+#~ msgstr "Pozycje zapisów konta są w niedozwolonym stanie"
+
+#, python-format
+#~ msgid "Date to must be set between %s and %s"
+#~ msgstr "Data musi być ustawiona między %s a %s"
+
+#, python-format
+#~ msgid "You can not use an inactive account!"
+#~ msgstr "Nie możesz używać nieaktywnego konta!"
+
+#, python-format
+#~ msgid ""
+#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
+#~ msgstr "Spodziewane saldo (%.2f) jest inne od obliczonego. (%.2f)"
+
+#, python-format
+#~ msgid "Unable to find a valid period !"
+#~ msgstr "Nie można znaleźć dozwolonego okresu !"
+
+#, python-format
+#~ msgid "Bad total !"
+#~ msgstr "Zła suma !"
+
+#, python-format
+#~ msgid "Global taxes defined, but are not in invoice lines !"
+#~ msgstr "Zdefiniowano globalne podatki, ale nie ma ich w pozycjach faktury !"
+
+#, python-format
+#~ msgid "Closing of states cancelled, please check the box !"
+#~ msgstr "Anulowano zamykanie stanów, zaznacz opcję !"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a confirmed entry ! Please note that you "
+#~ "can just change some non important fields !"
+#~ msgstr ""
+#~ "Nie możesz dokonywac modyfikacji na potwierdzonym zapisie ! Możesz tylko "
+#~ "zmieniać niektóre mało znaczące pola !"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a reconciled entry ! Please note that "
+#~ "you can just change some non important fields !"
+#~ msgstr ""
+#~ "Nie możesz modyfikować uzgodnionego zapisu ! Możesz zmieniać jedynie "
+#~ "niektóre mniej znaczące pola."
+
+#, python-format
+#~ msgid "Please set an analytic journal on this financial journal !"
+#~ msgstr "Proszę ustawić dziennik analityczny dla tego dziennika finansowego !"
+
+#, python-format
+#~ msgid "EXJ"
+#~ msgstr "DZ"
+
+#, python-format
+#~ msgid "Couldn't create move between different companies"
+#~ msgstr "Nie można tworzyć zapisów pomiędzy różnymi firmami"
+
+#, python-format
+#~ msgid "SAJ"
+#~ msgstr "DS"
+
+#, python-format
+#~ msgid "Closing of fiscal year cancelled, please check the box !"
+#~ msgstr "Anulowano zamknięcie roku podatkowego, proszę zaznacz opcję !"
+
+#, python-format
+#~ msgid ""
+#~ "Specified Journal does not have any account move entries in draft state for "
+#~ "this period"
+#~ msgstr ""
+#~ "Podany dziennik nie zawiera żadnych zapisów konta w stanie Projekt dla tego "
+#~ "okresu"
+
+#, python-format
+#~ msgid "Account move line \"%s\" is not valid"
+#~ msgstr "Pozycja zapisu konta \"%s\" jest niedozwolona"
+
+#, python-format
+#~ msgid "Cannot create invoice move on centralised journal"
+#~ msgstr "Nie można utworzyć zapisów faktury na zcentralizowanym dzienniku"
+
+#, python-format
+#~ msgid ""
+#~ "Selected Move lines does not have any account move enties in draft state"
+#~ msgstr "Wybrane pozycje zapisów konta nie mają zapisów w stanie projekt"
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 5a82c6d0513..ebd5704f956 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* account
+#	* account
 #
 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"
-"PO-Revision-Date: 2010-03-24 00:57+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"PO-Revision-Date: 2010-07-27 20:17+0000\n"
+"Last-Translator: Leandro Chaves <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-06-22 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-07-28 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -92,7 +92,8 @@ msgid "Unreconciled entries"
 msgstr "Lançamentos não reconciliados"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Código base"
@@ -124,7 +125,8 @@ msgid "Residual"
 msgstr "Residual"
 
 #. module: account
-#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -188,8 +190,8 @@ msgid "Move line select"
 msgstr "Mover a linha selecionada"
 
 #. module: account
-#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0
+#: rml:account.tax.code.entries:0
 msgid "Entry label"
 msgstr "Etiqueta de lançamento"
 
@@ -204,12 +206,14 @@ msgid "Period Sum"
 msgstr "Soma do período"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Computar Código (se tipo=código)"
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Linha de lançamento de conta"
 
@@ -226,10 +230,12 @@ msgstr "Lançamentos recorrentes"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
-#: field:account.invoice.tax,amount:0 field:account.move,amount:0
-#: field:account.tax,amount:0 field:account.tax.template,amount:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.reconcile.line,amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: field:account.move,amount:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
 msgid "Amount"
 msgstr "Montante"
 
@@ -269,7 +275,8 @@ msgstr ""
 "codificação mais rápida em cada diário."
 
 #. module: account
-#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -283,19 +290,20 @@ msgstr ""
 "exemplo 30/60/90 dias da data."
 
 #. module: account
-#: selection:account.tax,type:0 selection:account.tax.template,type:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fixo"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
 msgid "Overdue Payments"
 msgstr "Pagamentos atrasados"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -304,7 +312,8 @@ msgid "Select period"
 msgstr "Selecione o período"
 
 #. module: account
-#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Origem"
 
@@ -334,7 +343,9 @@ msgid "Delta Debit"
 msgstr "Diferença de Débito"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice,amount_tax:0
+#: model:account.account.type,name:account.account_type_tax
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Imposto"
@@ -347,18 +358,22 @@ msgstr "Trans. Débito"
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Conta analítica"
 
 #. module: account
-#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Imposto nas sub-contas"
 
 #. module: account
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Nome do diário"
@@ -426,8 +441,11 @@ msgid "Contra"
 msgstr "Contra"
 
 #. module: account
-#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
-#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
+#: field:account.analytic.account,state:0
+#: field:account.bank.statement,state:0
+#: field:account.invoice,state:0
+#: view:account.move:0
+#: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Estado"
@@ -439,7 +457,8 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Reembolsos a fornecedores não pagos"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Cálculo especial"
 
@@ -462,8 +481,10 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: account
-#: rml:account.general.ledger:0 field:account.model,ref:0
-#: field:account.move,ref:0 rml:account.overdue:0
+#: rml:account.general.ledger:0
+#: field:account.model,ref:0
+#: field:account.move,ref:0
+#: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ref"
@@ -660,9 +681,13 @@ msgid "Sub-Total :"
 msgstr "Subtotal:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0
+#: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Lançamentos analíticos"
 
@@ -677,6 +702,7 @@ msgid "Associated Partner"
 msgstr "Parceiro Associado"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Informação Adicional"
@@ -692,7 +718,8 @@ msgid "Select the Period for Analysis"
 msgstr "Selecione o Período para Análise"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -724,7 +751,8 @@ msgid "Field Name"
 msgstr "Nome do Campo"
 
 #. module: account
-#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0
+#: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Sinal para conta-pai"
 
@@ -734,7 +762,8 @@ msgid "End of Year Entries Journal"
 msgstr "Diário de lançamentos do fim do ano"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Purchase Properties"
 msgstr "Propriedades da Compra"
 
@@ -754,9 +783,12 @@ msgid "Move Lines Created."
 msgstr "Foram criadas linhas de movimento"
 
 #. module: account
-#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
-#: field:account.move,state:0 field:account.move.line,state:0
-#: field:account.period,state:0 field:account.subscription,state:0
+#: field:account.fiscalyear,state:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: field:account.subscription,state:0
 msgid "Status"
 msgstr "Posição"
 
@@ -913,8 +945,10 @@ msgstr "Selecionar plano de contas"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
-#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Quantidade"
@@ -957,13 +991,16 @@ msgstr "Fatura analítica"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0 rml:account.general.journal:0
+#: view:account.fiscalyear:0
+#: rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0 field:account.move,period_id:0
+#: field:account.journal.period,period_id:0
+#: field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0
+#: view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -985,7 +1022,8 @@ msgid "Net Total:"
 msgstr "Total líquido:"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1109,7 +1147,8 @@ msgid "Fiscal Position Templates"
 msgstr "Modelo de posição fiscal"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Preço unitário"
 
@@ -1267,7 +1306,8 @@ msgid "Not reconciled transactions"
 msgstr "Transação não conciliada"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Mapeamento de Impostos"
@@ -1289,7 +1329,8 @@ msgid "Write-Off account"
 msgstr "Conta de amortização"
 
 #. module: account
-#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0
+#: field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Modelo"
 
@@ -1315,9 +1356,11 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Selecionar as faturas que você quer pagar e adiantamentos a fazer"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0
+#: field:account.journal,view_id:0
 msgid "View"
 msgstr "Visualizar"
 
@@ -1389,7 +1432,8 @@ msgstr "Tipos de Conta"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1405,7 +1449,8 @@ msgid "Journal"
 msgstr "Diário"
 
 #. module: account
-#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0
+#: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Sub-contas"
 
@@ -1431,7 +1476,8 @@ msgid "Statement reconcile line"
 msgstr "Linha de reconciliação do Demonstrativo"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Manter vazio para usar a conta de receita"
 
@@ -1440,6 +1486,9 @@ msgstr "Manter vazio para usar a conta de receita"
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr "Baixa ou exclusão"
 
@@ -1560,7 +1609,8 @@ msgid "Account n°"
 msgstr "Conta n°"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Deixe vazio para usar a conta de despesas"
 
@@ -1570,7 +1620,8 @@ msgid "Account to reconcile"
 msgstr "Conta a reconciliar"
 
 #. module: account
-#: rml:account.invoice:0 field:account.model.line,partner_id:0
+#: rml:account.invoice:0
+#: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Código parceiro"
@@ -1582,12 +1633,14 @@ msgid "Receivable and Payable Accounts"
 msgstr "Contas a Pagar e Receber"
 
 #. module: account
-#: view:account.subscription:0 field:account.subscription,lines_id:0
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Linhas de inscrição"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1751,7 +1804,8 @@ msgid "Period length (days)"
 msgstr "Duração do Período (dias)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Percentual"
@@ -1762,7 +1816,8 @@ msgid "Charts"
 msgstr "Planos"
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1838,9 +1893,11 @@ msgstr "x Diário de Notas de Crédito gastas"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
-#: field:account.journal,type:0 field:account.move,type:0
-#: field:account.move.reconcile,type:0 xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: field:account.journal,type:0
+#: field:account.move,type:0
+#: field:account.move.reconcile,type:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -1988,7 +2045,8 @@ msgid "Journal-Period Name"
 msgstr "Diário-Nome do período"
 
 #. module: account
-#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Nome do caso da taxa"
 
@@ -2006,7 +2064,8 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2080,8 +2139,10 @@ msgstr "Passado"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
-#: field:account.journal,currency:0 field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.journal,currency:0
+#: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Moeda"
@@ -2119,7 +2180,8 @@ msgid "Analytic Entry"
 msgstr "Lançamento analítico"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Mensagem para Pagamentos Atrasados"
 
@@ -2171,7 +2233,8 @@ msgid "Detail"
 msgstr "Detalhe"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Consolidação"
 
@@ -2268,17 +2331,22 @@ msgid "The account basis of the tax declaration."
 msgstr "A base contábil da declaração de imposto."
 
 #. module: account
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0
+#: rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0 field:account.move,date:0
+#: rml:account.journal.period.print:0
+#: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
+#: field:account.subscription.line,date:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Date"
 msgstr "Data"
 
@@ -2294,7 +2362,8 @@ msgid "Unreconcile"
 msgstr "Não concilidado"
 
 #. module: account
-#: field:account.tax,type:0 field:account.tax.template,type:0
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Tipo de taxa"
 
@@ -2304,7 +2373,8 @@ msgid "Statement Entries"
 msgstr "Lançamentos do Demonstrativo"
 
 #. module: account
-#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0
+#: field:account.journal,user_id:0
 msgid "User"
 msgstr "Usuário"
 
@@ -2394,15 +2464,18 @@ msgid "Date End"
 msgstr "Data de término"
 
 #. module: account
-#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0
+#: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
 msgstr "Linhas de lançamentos"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Código aplicável (se tipo=código)"
 
@@ -2491,9 +2564,11 @@ msgstr "De contas analíticas, criar fatura."
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0
+#: wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0
+#: view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2512,7 +2587,8 @@ msgstr "De contas analíticas, criar fatura."
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -2522,8 +2598,10 @@ msgid "Acc. Type Name"
 msgstr "Nome Tipo de Conta"
 
 #. module: account
-#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2537,7 +2615,8 @@ msgid "Litigation"
 msgstr "Litígio"
 
 #. module: account
-#: view:account.move.line:0 wizard_view:account.move.validate,init:0
+#: view:account.move.line:0
+#: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Informação"
@@ -2582,6 +2661,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2654,7 +2735,8 @@ msgid "Price"
 msgstr "Preço"
 
 #. module: account
-#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2689,6 +2771,7 @@ msgid "Invoice Number"
 msgstr "Número da Fatura"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr "Fim do Período"
@@ -2721,13 +2804,17 @@ msgid "Invoice Reference"
 msgstr "Referencia fatura"
 
 #. module: account
-#: field:account.account,name:0 field:account.account.template,name:0
+#: field:account.account,name:0
+#: field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0 field:account.config.wizard,name:0
-#: field:account.model.line,name:0 field:account.move,name:0
-#: field:account.move.line,name:0 field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0
+#: field:account.config.wizard,name:0
+#: field:account.model.line,name:0
+#: field:account.move,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nome"
@@ -2770,7 +2857,8 @@ msgstr ""
 "dependentes/derivados."
 
 #. module: account
-#: field:account.journal.column,view_id:0 view:account.journal.view:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2863,11 +2951,14 @@ msgid "Full Account Name"
 msgstr "Nome Completo da Conta"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2888,7 +2979,9 @@ msgid "Document: Customer account statement"
 msgstr "Documento: demonstrativo da conta cliente"
 
 #. module: account
-#: view:product.product:0 view:product.template:0 view:res.partner:0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
 msgid "Accounting"
 msgstr "Contas"
 
@@ -2921,9 +3014,11 @@ msgstr "Linhas de lançamento"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr "Conciliação"
 
@@ -2933,8 +3028,10 @@ msgid "Centralisation"
 msgstr "Centralização"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
-#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax,tax_code_id:0
+#: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Código da taxa"
@@ -2977,12 +3074,13 @@ msgstr ""
 "mais o prazo de pagamento\""
 
 #. module: account
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situação"
 
 #. module: account
-#: rml:account.invoice:0 xsl:account.transfer:0
+#: rml:account.invoice:0
 msgid "Document"
 msgstr "Documento"
 
@@ -3022,7 +3120,8 @@ msgid "Cancel selected invoices"
 msgstr "Cancelar faturas selecionadas"
 
 #. module: account
-#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3031,6 +3130,8 @@ msgstr "Diário analítico"
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr "Aba de lançamento"
 
@@ -3045,23 +3146,28 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Definir como Provisório"
 
 #. module: account
-#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Referencia ao documento que produziu esta fatura."
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "A Pagar"
 
 #. module: account
-#: rml:account.invoice:0 field:account.invoice.tax,base:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Base"
 
@@ -3071,7 +3177,8 @@ msgid "Model Name"
 msgstr "Nome do modelo"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Others"
 msgstr "Outros"
 
@@ -3081,13 +3188,15 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0 view:account.move:0
+#: view:account.invoice:0
+#: view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Validar"
 
 #. module: account
-#: view:account.model:0 field:account.model,legend:0
+#: view:account.model:0
+#: field:account.model,legend:0
 msgid "Legend"
 msgstr "Legenda"
 
@@ -3102,14 +3211,17 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0 rml:account.account.balance:0
+#: view:account.account:0
+#: rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0
+#: field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3130,9 +3242,12 @@ msgid "By Date and Period"
 msgstr "Por data e período"
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0 view:account.invoice.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Observações"
@@ -3147,7 +3262,8 @@ msgstr ""
 "pagamentos."
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3172,15 +3288,21 @@ msgid "Statement encoding produces payment entries"
 msgstr "Codificação de demonstrativos para lançamentos de pagamento"
 
 #. module: account
-#: field:account.account,code:0 rml:account.account.balance:0
-#: field:account.account.template,code:0 field:account.account.type,code:0
+#: field:account.account,code:0
+#: rml:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
-#: rml:account.general.journal:0 field:account.journal,code:0
-#: rml:account.partner.balance:0 field:account.period,code:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0
+#: field:account.fiscalyear,code:0
+#: rml:account.general.journal:0
+#: field:account.journal,code:0
+#: rml:account.partner.balance:0
+#: field:account.period,code:0
 msgid "Code"
 msgstr "Código"
 
@@ -3190,7 +3312,8 @@ msgid "Financial Management"
 msgstr "Administração financeira"
 
 #. module: account
-#: selection:account.account.type,close_method:0 selection:account.tax,type:0
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Nada"
@@ -3202,6 +3325,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr "Gerar Lançamentos Iniciais de Abertura do Ano Fiscal"
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr "Reconciliar lançamentos"
@@ -3217,7 +3341,8 @@ msgid "Additionnal Information"
 msgstr "Informação adicional"
 
 #. module: account
-#: field:account.tax,name:0 field:account.tax.template,name:0
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Nome da taxa"
@@ -3294,7 +3419,8 @@ msgid "Partner Balance"
 msgstr "Saldo do parceiro"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Ficha de terceiros"
 
@@ -3309,7 +3435,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3348,7 +3475,8 @@ msgid "Import invoice"
 msgstr "Importar fatura"
 
 #. module: account
-#: view:account.invoice:0 view:wizard.company.setup:0
+#: view:account.invoice:0
+#: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Criado"
@@ -3364,7 +3492,8 @@ msgid "Invoice line"
 msgstr "Linha da fatura"
 
 #. module: account
-#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Atalho"
 
@@ -3393,13 +3522,15 @@ msgstr ""
 "moeda"
 
 #. module: account
-#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Conta-pai de Impostos"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0 view:account.account.type:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3435,7 +3566,8 @@ msgid "Central Journal"
 msgstr "Diário Central"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Saldo transferido de para"
 
@@ -3511,7 +3643,8 @@ msgid "Journal code"
 msgstr "Código do diário"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0
+#: view:account.model:0
 msgid "Create entries"
 msgstr "Criar lançamentos"
 
@@ -3549,7 +3682,6 @@ msgstr ""
 "Esta forma de pagamento será usada em vez da padrão para o parceiro atual"
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr "Nome do lançamento"
@@ -3570,11 +3702,14 @@ msgstr ""
 "(VAT) relativos a este código de imposto apareçam nas faturas"
 
 #. module: account
-#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Sequencia"
@@ -3642,7 +3777,8 @@ msgstr "Inscriçãoda conta"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0 rml:account.overdue:0
+#: field:account.move.line,date_maturity:0
+#: rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Data de vencimento"
 
@@ -3662,7 +3798,8 @@ msgid "Account Configure Wizard "
 msgstr "Assistente de configuração de conta "
 
 #. module: account
-#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Data de Início"
@@ -3700,7 +3837,8 @@ msgid "Unreconciled"
 msgstr "Não conciliado"
 
 #. module: account
-#: field:account.account,note:0 field:account.account.template,note:0
+#: field:account.account,note:0
+#: field:account.account.template,note:0
 msgid "Note"
 msgstr "Nota"
 
@@ -3733,7 +3871,8 @@ msgid "Entry Sequence"
 msgstr "Sequencia de lançamento"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Fechado"
 
@@ -3863,9 +4002,12 @@ msgid "Code/Date"
 msgstr "Código/Data"
 
 #. module: account
-#: field:account.account,active:0 field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0 field:account.journal,active:0
-#: field:account.journal.period,active:0 field:account.payment.term,active:0
+#: field:account.account,active:0
+#: field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Ativo"
@@ -3917,15 +4059,20 @@ msgid "Secondary Currency"
 msgstr "Moeda secundária"
 
 #. module: account
-#: field:account.account,credit:0 rml:account.account.balance:0
+#: field:account.account,credit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.journal.period.print:0
-#: field:account.model.line,credit:0 field:account.move.line,credit:0
-#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3958,7 +4105,8 @@ msgid "Account Move"
 msgstr "Movimentos da Conta"
 
 #. module: account
-#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Linhas do demonstrativo"
 
@@ -4055,15 +4203,18 @@ msgid "Journal Column"
 msgstr "Coluna do diário"
 
 #. module: account
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Concluído"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0 view:account.fiscalyear:0
+#: field:account.config.wizard,period:0
+#: view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4076,7 +4227,8 @@ msgid "Periods"
 msgstr "Períodos"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4103,7 +4255,8 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr "Custos analíticos para fatura de compra, planilhas, ..."
 
 #. module: account
-#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Taxas padrão"
 
@@ -4163,7 +4316,8 @@ msgstr "Controlos de tipo"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Nome da conta"
 
@@ -4254,7 +4408,8 @@ msgid "Import file from your bank statement"
 msgstr "Importar arquivo do seu extrato bancário"
 
 #. module: account
-#: field:account.account,type:0 field:account.account.template,type:0
+#: field:account.account,type:0
+#: field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Tipo interno"
 
@@ -4280,12 +4435,14 @@ msgid "Posted"
 msgstr "Publicado"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Notas de crédito"
 
 #. module: account
-#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0
+#: field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Data de Término"
 
@@ -4306,7 +4463,8 @@ msgid "Day of the Month"
 msgstr "Dia do mês"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Linhas"
 
@@ -4327,7 +4485,8 @@ msgstr ""
 "impostos derivados."
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Declaração da taxa"
 
@@ -4387,12 +4546,14 @@ msgid "The optional quantity on entries"
 msgstr "A quantidade opcional nos lançamentos"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JNRL"
 
 #. module: account
-#: view:account.fiscalyear:0 view:account.period:0
+#: view:account.fiscalyear:0
+#: view:account.period:0
 msgid "States"
 msgstr "Estado"
 
@@ -4428,7 +4589,8 @@ msgstr "Data de início"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Total"
 
@@ -4547,9 +4709,11 @@ msgstr "Lançamentos válidos da fatura"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0 field:account.journal,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4646,9 +4810,12 @@ msgid "Print Aged Trial Balance"
 msgstr "Imprimir saldo tentativo anterior"
 
 #. module: account
-#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0 field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0
+#: field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Ref."
 
@@ -4728,7 +4895,8 @@ msgid "Control Invoice"
 msgstr "Controlar fatura"
 
 #. module: account
-#: selection:account.account,type:0 selection:account.account.template,type:0
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Receber"
@@ -4755,7 +4923,8 @@ msgstr "Imposto:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0 rml:account.general.journal:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Total:"
@@ -4766,7 +4935,8 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Mapeamento de contas"
@@ -4782,7 +4952,8 @@ msgid "Account Reconciliation"
 msgstr "Reconciliação da conta"
 
 #. module: account
-#: view:account.bank.statement:0 selection:account.bank.statement,state:0
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -4797,7 +4968,8 @@ msgid "Parent Account Template"
 msgstr "Modelo de conta-pai"
 
 #. module: account
-#: help:account.tax,domain:0 help:account.tax.template,domain:0
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4818,7 +4990,8 @@ msgid "Analytic account"
 msgstr "Conta analítica"
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Fatura do fornecedor"
 
@@ -4828,16 +5001,22 @@ msgid "Valid"
 msgstr "Válido"
 
 #. module: account
-#: field:account.account,debit:0 rml:account.account.balance:0
+#: field:account.account,debit:0
+#: rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 field:account.model.line,debit:0
-#: field:account.move.line,debit:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.central.journal:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Débito"
@@ -4858,6 +5037,7 @@ msgid "Invoice Lines"
 msgstr "Linhas da fatura"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr "Início do Período"
@@ -4899,7 +5079,8 @@ msgid "Reporting"
 msgstr "Relatórios"
 
 #. module: account
-#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -4930,7 +5111,8 @@ msgid "Configuration"
 msgstr "Configuração"
 
 #. module: account
-#: view:account.analytic.line:0 view:account.invoice:0
+#: view:account.analytic.line:0
+#: view:account.invoice:0
 msgid "Total amount"
 msgstr "Quantia total"
 
@@ -4953,7 +5135,8 @@ msgstr "Conta de receita no modelo de produtos"
 #: help:account.account,currency_id:0
 #: help:account.account.template,currency_id:0
 msgid "Force all moves for this account to have this secondary currency."
-msgstr "Força todos os movimentos dessa conta para usarem a moeda secundária."
+msgstr ""
+"Força todos os movimentos dessa conta para usarem a moeda secundária."
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,end:0
@@ -4980,12 +5163,14 @@ msgid "Paid invoice"
 msgstr "Fatura paga"
 
 #. module: account
-#: view:account.tax:0 view:account.tax.template:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Definição da taxa"
 
 #. module: account
-#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0
+#: field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Grupo da taxa"
 
@@ -5028,7 +5213,8 @@ msgid "With movements"
 msgstr "Com movimentos"
 
 #. module: account
-#: field:account.tax,domain:0 field:account.tax.template,domain:0
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domínio"
 
@@ -5053,7 +5239,9 @@ msgid "Manually"
 msgstr "Manualmente"
 
 #. module: account
-#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5070,7 +5258,8 @@ msgid "Payable Accounts"
 msgstr "Contas a pagar"
 
 #. module: account
-#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Linha da fatura"
 
@@ -5109,7 +5298,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
 msgid "This Month"
-msgstr "Este mes"
+msgstr "Este mês"
 
 #. module: account
 #: field:account.account.type,sign:0
@@ -5122,7 +5311,8 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "A outra moeda opcional se este for um lançamento multi-moeda"
 
 #. module: account
-#: view:account.invoice:0 field:account.invoice,payment_ids:0
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Pagamentos"
@@ -5168,9 +5358,12 @@ msgstr "Escolha diário e data de pagamento"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
-#: selection:account.journal.period,state:0 selection:account.move,state:0
-#: selection:account.move.line,state:0 selection:account.period,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.move,state:0
+#: selection:account.move.line,state:0
+#: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Provisório"
@@ -5197,7 +5390,8 @@ msgid "Are you sure ?"
 msgstr "Tem certeza?"
 
 #. module: account
-#: rml:account.invoice:0 view:account.invoice:0
+#: rml:account.invoice:0
+#: view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Pro-forma"
 
@@ -5233,16 +5427,20 @@ msgid "Supplier Invoice Process"
 msgstr "Processo de fatura do fornecedor"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
-#: rml:account.journal.period.print:0 rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Página"
 
 #. module: account
-#: view:account.move:0 view:account.move.line:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Optional Information"
 msgstr "Informação Opcional"
 
@@ -5258,7 +5456,8 @@ msgid "Receivable and Payable"
 msgstr "A receber e a pagar"
 
 #. module: account
-#: rml:account.account.balance:0 rml:account.general.journal:0
+#: rml:account.account.balance:0
+#: rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5284,7 +5483,8 @@ msgstr ""
 "campo conterá um valor básico (sem o imposto)"
 
 #. module: account
-#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Calcular"
@@ -5318,7 +5518,6 @@ msgstr "Número de períodos"
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5328,7 +5527,8 @@ msgid "End of period"
 msgstr "Fim de período"
 
 #. module: account
-#: view:account.move:0 model:ir.model,name:account.model_account_move
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Conta Lançamento"
 
@@ -5339,7 +5539,8 @@ msgid "General Journal"
 msgstr "Diário geral"
 
 #. module: account
-#: field:account.account,balance:0 rml:account.account.balance:0
+#: field:account.account,balance:0
+#: rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5347,9 +5548,12 @@ msgstr "Diário geral"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0 field:account.move.line,balance:0
-#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0 rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: rml:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Saldo"
@@ -5395,8 +5599,11 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "A sequência utilizada para numeração das faturas neste diário."
 
 #. module: account
-#: view:account.account:0 view:account.account.template:0
-#: view:account.journal:0 view:account.move:0 view:account.move.line:0
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "General Information"
 msgstr "Informações Gerais"
 
@@ -5438,7 +5645,8 @@ msgid "List of Accounts"
 msgstr "Lista de contas"
 
 #. module: account
-#: view:product.product:0 view:product.template:0
+#: view:product.product:0
+#: view:product.template:0
 msgid "Sales Properties"
 msgstr "Propriedades das vendas"
 
@@ -5503,7 +5711,6 @@ msgstr "Ano fiscal para fechar"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5531,11 +5738,15 @@ msgstr "intraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
-#: field:account.invoice,name:0 field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0
+#: rml:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0 field:account.payment.term,note:0
-#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
+#: rml:account.overdue:0
+#: field:account.payment.term,note:0
+#: field:account.tax.code,info:0
+#: field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Descrição"
 
@@ -5583,7 +5794,8 @@ msgstr ""
 "parceiro atual"
 
 #. module: account
-#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Codigo do caso"
 
@@ -5665,7 +5877,8 @@ msgstr "Definições do modelo"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
 msgid "Cash"
 msgstr "Dinheiro"
 
@@ -5705,7 +5918,8 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Mantenha vazia para todos os anos fiscais abertos"
 
 #. module: account
-#: rml:account.invoice:0 selection:account.invoice,type:0
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Reembolso a fornecedor"
 
@@ -5754,8 +5968,10 @@ msgstr ""
 "categoria de produto"
 
 #. module: account
-#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5789,8 +6005,10 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Nome do ano fiscal para as telas"
 
 #. module: account
-#: field:account.invoice,payment_term:0 view:account.payment.term:0
-#: field:account.payment.term,name:0 view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5849,7 +6067,8 @@ msgstr "Sim"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid "Check this if the user is allowed to reconcile entries in this account."
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Marque isto se ao usuário é permitido reconciliar lançamentos nesta conta."
 
@@ -5875,7 +6094,8 @@ msgid "Accounting Dashboard"
 msgstr ""
 
 #. module: account
-#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
 msgstr ""
 
@@ -5923,39 +6143,39 @@ msgstr ""
 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr "Todas as Contas"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
 msgid "Entries Selection Based on"
-msgstr "Seleção de entradas baseada em"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr "Notificação"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr "Período Financeiro"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr "Saldo da Conta"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr "Selecione o(s) Período(s)"
+msgstr ""
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr "Porcentagem"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
@@ -5970,12 +6190,12 @@ msgstr "Selecione Ano(s) Fiscal(is) (máximo três anos)"
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
 msgid "Select Reference Account(for  % comparision)"
-msgstr "Selecione conta de referência (para comparação %)"
+msgstr "Selecione conta de referência (para comparação de %)"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr "Conta Saldo Comparar Anos"
+msgstr ""
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6002,7 +6222,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You have to select 'Landscape' option. Please Check it."
-msgstr ""
+msgstr "Você tem que selecionar a opção 'Paisagem'. Por favor marque-a."
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
@@ -6021,14 +6241,14 @@ msgid "Show Comparision in %"
 msgstr "Mostrar comparação em %"
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
-msgstr "Selecione o Período"
+msgstr "Selecione o período"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr "Opções de Relatório"
+msgstr "Opções de relatório"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
@@ -6043,23 +6263,23 @@ msgstr "Mostrar Contas"
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "1. You have selected more than 3 years in any case."
-msgstr ""
+msgstr "1. Você selecionou mais de 3 anos em qualquer caso."
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "Comparação de Contas de Contabilidade e gestão financeira,"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Ano :"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You can select maximum 3 years. Please check again."
-msgstr ""
+msgstr "Você pode escolher no maximo 3 anos. Por favor tente novamente"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6067,22 +6287,26 @@ msgid ""
 "3. You have selected 'Percentage' option with more than 2 years, but you "
 "have not selected landscape format."
 msgstr ""
+"3. Você selecionou a opção 'Porcentagem' com mais de 2 anos, mas não "
+"escolheu o formato paisagem."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "You might have done following mistakes. Please correct them and try again."
 msgstr ""
+"Você pode ter cometido os enganos a seguir. Por favor, corrija-os e tente "
+"novamente."
 
 #. module: account
 #: help:account.balance.account.balance.report,init,select_account:0
 msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "Mantenha vazia para a comparação com sua matriz"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data de criação"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6090,93 +6314,98 @@ msgid ""
 "2. You have not selected 'Percentage' option, but you have selected more "
 "than 2 years."
 msgstr ""
+"2. Você não selecionou a Opção 'Porcentagem', mas você selecionou mais de 2 "
+"anos."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid ""
-"You may have selected the compare options with more than 1 year with credit/"
-"debit columns and % option.This can lead contents to be printed out of the "
-"paper.Please try again."
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
 msgstr ""
+"Você pode ter selecionado a opção de comparar com mais de 1 ano de colunas "
+"crédito/débito e opção %. Isso pode gerar a impressão fora do papel. Por "
+"favor tente novamente."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr ""
+msgstr "Você tem que escolher pelo menos 1 ano fiscal. Tente novamente."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "Personalizar relatório"
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Faixa de Mês(es)"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Faturas criadas nos últimos 15 dias"
 
 #. module: account
-#: model:ir.model,name:account.model_report_invoice_created
+#: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Relatório de faturas criadas nos últimos 15 dias"
 
 #. module: account
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Quantia total"
 
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "Contas por tipo"
 
 #. module: account
-#: model:ir.model,name:account.model_report_aged_receivable
+#: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_report_account_receivable
+#: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "Contas a receber"
 
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Intervalo"
 
 #. module: account
-#: model:ir.module.module,description:account.module_meta_information
+#: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
-msgstr ""
+msgstr "Um módulo que adiciona novos relatórios com base no módulo de conta."
 
 #. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_receivable_graph
-#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Saldo por tipo de conta"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "Semana do Ano"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Criar data"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
 msgstr ""
@@ -6184,7 +6413,331 @@ msgstr ""
 #. module: account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Valor sem Impostos"
+
+#, python-format
+#~ msgid "Bank Journal "
+#~ msgstr "Diário Bancário "
+
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "Erro de integridade !"
+
+#, python-format
+#~ msgid "Purchase Journal"
+#~ msgstr "Diário de compras"
+
+#, python-format
+#~ msgid "No sequence defined in the journal !"
+#~ msgstr "Nenhuma sequencia definida no diário !"
+
+#, python-format
+#~ msgid "The journal must have default credit and debit account"
+#~ msgstr "O diário precisa ter uma conta de débito e crédito padrão"
+
+#, python-format
+#~ msgid "No Analytic Journal !"
+#~ msgstr "Nenum diário analítico !"
+
+#, python-format
+#~ msgid "Please set an analytic journal on this financial journal !"
+#~ msgstr "Por favor fixe um diário analítico neste diário financeiro!"
+
+#, python-format
+#~ msgid "Sales Journal"
+#~ msgstr "Diário de vendas"
+
+#, python-format
+#~ msgid "Couldn't create move between different companies"
+#~ msgstr "Não foi possível criar movimentação entre empresas diferentes"
+
+#, python-format
+#~ msgid "The journal must have centralised counterpart"
+#~ msgstr "O diário deve ter uma contrapartida centralizada"
+
+#, python-format
+#~ msgid "BNK"
+#~ msgstr "BNK"
+
+#, python-format
+#~ msgid "SAJ"
+#~ msgstr "SAJ"
+
+#, python-format
+#~ msgid "EXJ"
+#~ msgstr "EXJ"
+
+#, python-format
+#~ msgid "Bad total !"
+#~ msgstr "Total inválido!"
+
+#, python-format
+#~ msgid "End of Fiscal Year Entry"
+#~ msgstr "Lançamento de Fim do Período Fiscal"
+
+#, python-format
+#~ msgid "Free Reference"
+#~ msgstr "Referencia livre"
+
+#, python-format
+#~ msgid "Please verify that an account is defined in the journal."
+#~ msgstr "Por favor verifique se uma conta está definida no diário."
+
+#, python-format
+#~ msgid "Standard Encoding"
+#~ msgstr "Codificação padrão"
+
+#, python-format
+#~ msgid "Bad account!"
+#~ msgstr "Conta inválida!"
+
+#, python-format
+#~ msgid "Taxes missing !"
+#~ msgstr "Impostos faltando!"
+
+#, python-format
+#~ msgid "Closing of fiscal year cancelled, please check the box !"
+#~ msgstr "Fechamento do ano fiscal cancelado, por favor marque a caixa."
+
+#, python-format
+#~ msgid "No piece number !"
+#~ msgstr "Nenhum número da parte!"
+
+#, python-format
+#~ msgid "Closing of states cancelled, please check the box !"
+#~ msgstr "Fechamento dos estados cancelado, por favor marque a caixa!"
+
+#, python-format
+#~ msgid "You have to define an analytic journal on the '%s' journal!"
+#~ msgstr "Você deve definir um diário analítico no '%s' de diário!"
+
+#, python-format
+#~ msgid ""
+#~ "Specified Journal does not have any account move entries in draft state for "
+#~ "this period"
+#~ msgstr ""
+#~ "O diário especificado não tem nenhuma entrada do movimento da conta no "
+#~ "estado do esboço para este período"
+
+#, python-format
+#~ msgid "Account move line \"%s\" is not valid"
+#~ msgstr "Linha \" %s\" do movimento da conta é inválido"
+
+#, python-format
+#~ msgid "You have to provide an account for the write off entry !"
+#~ msgstr "Você tem que fornecer uma conta para a amortizar lançamento!"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Mensagem !"
+
+#, python-format
+#~ msgid "You can not delete posted movement: \"%s\"!"
+#~ msgstr "Você não pode excluir o movimento: \"% s\"!"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "Nenhum diário analítico !"
+
+#, python-format
+#~ msgid "You can not use this general account in this journal !"
+#~ msgstr "You can not use this general account in this journal !"
+
+#, python-format
+#~ msgid "You can not add/modify entries in a closed journal."
+#~ msgstr "Você não pode incluir/modificar as lançamentos em um diário fechado."
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a reconciled entry ! Please note that "
+#~ "you can just change some non important fields !"
+#~ msgstr ""
+#~ "Você não pode fazer uma modificação em lançamentos conciliados! Observe que "
+#~ "você pode simplesmente mudar alguns campos sem importância!"
+
+#, python-format
+#~ msgid "You must first select a partner !"
+#~ msgstr "Voce precisa selecionar um parceiro primeiro !"
 
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
+
+#, python-format
+#~ msgid ""
+#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
+#~ msgstr "O balanço esperado (%.2f) é diferente do calculado. (%.2f)"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a confirmed entry ! Please note that you "
+#~ "can just change some non important fields !"
+#~ msgstr ""
+#~ "Voce não pode modificar um lançamento confirmado ! Voce pode apenas trocar "
+#~ "alguns campos sem importância !"
+
+#, python-format
+#~ msgid "No Partner Defined !"
+#~ msgstr "Número do parceiro definido !"
+
+#, python-format
+#~ msgid "Entries are not of the same account or already reconciled ! "
+#~ msgstr "Lançamentos não são das mesmas contas ou já estão conciliados ! "
+
+#, python-format
+#~ msgid "Invalid action !"
+#~ msgstr "Ação invalida !"
+
+#, python-format
+#~ msgid "Some entries are already reconciled !"
+#~ msgstr "Alguns lançamentos já estão conciliados !"
+
+#, python-format
+#~ msgid "Already Reconciled"
+#~ msgstr "Já conciliado"
+
+#, python-format
+#~ msgid "Entries: "
+#~ msgstr "Lancamentos: "
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Erro !"
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "Erro de usuário"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Mensagem"
+
+#, python-format
+#~ msgid "You can not use an inactive account!"
+#~ msgstr "Voce não pode usar uma conta inativa!"
+
+#, python-format
+#~ msgid "Entry is already reconciled"
+#~ msgstr "Lançamentos estão conciliados"
+
+#, python-format
+#~ msgid "This period is already closed !"
+#~ msgstr "Este período já está fechado"
+
+#, python-format
+#~ msgid ""
+#~ "Selected Move lines does not have any account move enties in draft state"
+#~ msgstr ""
+#~ "As linhas do movimento selecionado nao tem nenhuma conta a ser movida para o "
+#~ "estado de esboço"
+
+#, python-format
+#~ msgid "Bad account !"
+#~ msgstr "Conta errada!"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#, python-format
+#~ msgid "Your journal must have a default credit and debit account."
+#~ msgstr "Seu diário precisa ter uma conta de crédito e débito padrão."
+
+#, python-format
+#~ msgid "No Period found on Invoice!"
+#~ msgstr "Nenhum período encontrado na fatura!"
+
+#, python-format
+#~ msgid "No journal for ending writing has been defined for the fiscal year"
+#~ msgstr "Nenhum diário para escrituração foi definido para o ano fiscal"
+
+#, python-format
+#~ msgid "No period found !"
+#~ msgstr "Nenhum período encontrado !"
+
+#, python-format
+#~ msgid "No Data Available"
+#~ msgstr "Nenhum dado disponível"
+
+#, python-format
+#~ msgid "Cannot delete invoice(s) that are already opened or paid !"
+#~ msgstr "Impossível excluir fatura(s) que já foram abertas ou pagas!"
+
+#, python-format
+#~ msgid "Unable to find a valid period !"
+#~ msgstr "Não foi possível encontrar um período válido!"
+
+#, python-format
+#~ msgid "No records found for your selection!"
+#~ msgstr "Nenhum registro encontrado para sua seleção"
+
+#, python-format
+#~ msgid "You can not change the tax, you should remove and recreate lines !"
+#~ msgstr ""
+#~ "Você não pode alterar o imposto, ao invés disso remova e recrie as linhas!"
+
+#, python-format
+#~ msgid "Date to must be set between %s and %s"
+#~ msgstr "Data deve ser definida entre %s e %s"
+
+#, python-format
+#~ msgid "Global taxes defined, but are not in invoice lines !"
+#~ msgstr ""
+#~ "As taxas globais estão definidas, mas não estão nas linhas da fatura!"
+
+#, python-format
+#~ msgid "Data Insufficient !"
+#~ msgstr "Dados insuficientes!"
+
+#, python-format
+#~ msgid "Invoice is already reconciled"
+#~ msgstr "Fatura já está reconciliada"
+
+#, python-format
+#~ msgid "You must enter a period length that cannot be 0 or below !"
+#~ msgstr "Você deve digitar um período que não seja 0 ou menor !"
+
+#, python-format
+#~ msgid "The opening journal must not have any entry in the new fiscal year !"
+#~ msgstr ""
+#~ "O diário de abertura não deve ter nenhum lançamento no novo ano fiscal !"
+
+#, python-format
+#~ msgid "You must select accounts to reconcile"
+#~ msgstr "Você deve selecionar as contas para reconciliar"
+
+#, python-format
+#~ msgid "Cannot create invoice move on centralised journal"
+#~ msgstr "Não é possível criar um movimento de fatura no diário centralizado"
+
+#, python-format
+#~ msgid "Entry \"%s\" is not valid !"
+#~ msgstr "Lançamento \"%s\" não é válido"
+
+#, python-format
+#~ msgid "Unable to reconcile entry \"%s\": %.2f"
+#~ msgstr "Incapaz reconciliar lançamento \"% s \": %.2f"
+
+#, python-format
+#~ msgid "The account entries lines are not in valid state."
+#~ msgstr "As linhas de lançamentos de conta não estão em formato válido."
+
+#, python-format
+#~ msgid "You can not modify/delete a journal with entries for this period !"
+#~ msgstr ""
+#~ "Você não pode modificar/apagar um diário com lançamentos para esse período !"
+
+#, python-format
+#~ msgid "Can not %s draft/proforma/cancel invoice."
+#~ msgstr "Não pode %s provisório/proforma/cancelar fatura."
+
+#, python-format
+#~ msgid "Can not pay draft/proforma/cancel invoice."
+#~ msgstr "Não se pode pagar uma fatura provisória/proforma/cancelada"
+
+#, python-format
+#~ msgid "You must define an analytic journal of type '%s' !"
+#~ msgstr "Você tem que definir um diário analítico '%s' !"
+
+#, python-format
+#~ msgid "Unable to change tax !"
+#~ msgstr "Não foi possível alterar o imposto!"
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index e4f68c20028..5476228f59d 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: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-11 07:51+0000\n"
-"Last-Translator: Nguyễn Thịnh <thinhnverp@gmail.com>\n"
+"PO-Revision-Date: 2010-07-20 03:39+0000\n"
+"Last-Translator: Business Link Development Technologies <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-06-22 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -25,28 +25,28 @@ msgstr "Tên nội bộ"
 #. module: account
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr ""
+msgstr "Mã số thuế"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree9
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree9
 msgid "Unpaid Supplier Invoices"
-msgstr ""
+msgstr "Hoá đơn từ nhà cung cấp chưa thanh toán"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
-msgstr "mục endoding"
+msgstr "Mã hoá mục"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Chỉ định Thông báo cho Báo cáo thanh toán quá hạn"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr ""
+msgstr "Xác nhận kê khai tạm"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
@@ -61,19 +61,21 @@ msgstr ""
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "Đơn vị tiền được sử dụng để nhập bảng kê khai"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
 msgid "Select Message"
-msgstr ""
+msgstr "Lựa chọn thông báo"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
 msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
-msgstr "tài khoản này sẽ được dùng cho giá của sản phẩm đưa vào danh mục"
+msgstr ""
+"Tài khoản này sẽ được sử dụng để định giá tồn kho sắp đến đối với loại sản "
+"phẩm này."
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -89,7 +91,7 @@ msgstr "kết quả hòa giả"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "không thể hòa giải"
+msgstr "Mục chưa được tổng hợp"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -107,7 +109,7 @@ msgstr "thống kê tài chính"
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
 #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
 msgid "Print Taxes Report"
-msgstr ""
+msgstr "in báo cáo thuế"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -189,8 +191,6 @@ msgstr "di chuyển dòng lựa chọn"
 #. module: account
 #: rml:account.journal.period.print:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "thử nhãn hàng"
 
@@ -235,7 +235,6 @@ msgstr ""
 #: field:account.move,amount:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
-#: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Số tiền"
 
@@ -299,7 +298,6 @@ msgstr ""
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -339,6 +337,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
+#: model:account.account.type,name:account.account_type_tax
 #: rml:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -353,7 +352,9 @@ msgstr "thay đổi báo có."
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "truy vấn tài khoản"
@@ -675,8 +676,11 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,line_ids:0
 #: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr ""
 
@@ -691,6 +695,7 @@ msgid "Associated Partner"
 msgstr "liên kết khách hàng"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Thông tin bổ sung"
@@ -1460,6 +1465,9 @@ msgstr ""
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr ""
 
@@ -1865,7 +1873,6 @@ msgstr ""
 #: field:account.journal,type:0
 #: field:account.move,type:0
 #: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
 msgid "Type"
 msgstr ""
 
@@ -2299,13 +2306,13 @@ msgstr ""
 #: selection:account.general.ledger.report,checktype,sortbydate:0
 #: rml:account.journal.period.print:0
 #: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
 #: field:account.subscription.line,date:0
 #: rml:account.tax.code.entries:0
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
 msgid "Date"
 msgstr ""
 
@@ -2422,6 +2429,7 @@ msgstr ""
 #: view:account.bank.statement:0
 #: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
@@ -2613,6 +2621,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2716,6 +2726,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr ""
@@ -2899,8 +2910,6 @@ msgstr ""
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
@@ -2957,9 +2966,11 @@ msgstr ""
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr ""
 
@@ -3019,7 +3030,6 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-#: xsl:account.transfer:0
 msgid "Document"
 msgstr ""
 
@@ -3067,6 +3077,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr ""
 
@@ -3258,6 +3270,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr ""
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr ""
@@ -3605,7 +3618,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr ""
@@ -4912,6 +4924,7 @@ msgid "Invoice Lines"
 msgstr ""
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr ""
@@ -5304,8 +5317,6 @@ msgstr ""
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
@@ -5387,7 +5398,6 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5576,7 +5586,6 @@ msgstr ""
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5934,6 +5943,335 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr ""
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+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 ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:report_account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
 #, python-format
 #~ msgid "Warning !"
 #~ msgstr "Cảnh báo"
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index e855082a108..154f39fc421 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-13 03:12+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-07-22 01:32+0000\n"
+"Last-Translator: digitalsatori <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-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-07-23 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -35,7 +35,7 @@ msgstr "未支付的采购发票"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
-msgstr "录入的记录"
+msgstr "分录录入"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
@@ -55,7 +55,7 @@ msgstr "资产"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模块名。"
+msgstr "在动作定义使用了无效的模式名称。"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -87,14 +87,14 @@ msgstr "对账结果"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "取消核销"
+msgstr "未对账分录"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr "基于的税务"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -115,7 +115,7 @@ msgstr "上级科目"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr "原始凭证集合"
+msgstr ""
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -215,7 +215,7 @@ msgstr "明细"
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
 msgid "Aged Trial Balance"
-msgstr "账龄试算平衡表"
+msgstr "旧的试算表"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -239,7 +239,7 @@ msgstr "金额"
 #: model:ir.actions.wizard,name:account.wizard_third_party_ledger
 #: model:ir.ui.menu,name:account.menu_third_party_ledger
 msgid "Partner Ledger"
-msgstr "业务伙伴总帐"
+msgstr "业务伙伴分类账"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -460,7 +460,7 @@ msgstr "从草稿确认, 与对/ 不对账"
 #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
 msgid "Bank reconciliation"
-msgstr "银行对账"
+msgstr "银行对帐单"
 
 #. module: account
 #: rml:account.invoice:0
@@ -680,7 +680,7 @@ msgstr "月"
 #. module: account
 #: field:account.analytic.account,partner_id:0
 msgid "Associated Partner"
-msgstr "相关业务伙伴"
+msgstr "相关的业务伙伴"
 
 #. module: account
 #: view:account.invoice:0
@@ -795,7 +795,7 @@ msgstr "之前生成的记录:"
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr "成本分类帐"
+msgstr "成本分类账"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -888,7 +888,7 @@ msgstr "补差额集合"
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "货币金额"
+msgstr "另一货币金额"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -1182,7 +1182,7 @@ msgstr "银行收据"
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr "银行账号"
+msgstr "银行帐号"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
@@ -1897,7 +1897,7 @@ msgstr "支付发票"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr "错误：无效的Bvr号（错误的检验和）"
+msgstr "错误：无效的Bvr号(校验错误)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
@@ -4212,7 +4212,7 @@ msgstr "这序列提供记录集合列表的显示顺序"
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr "类型控制"
+msgstr "控制类型"
 
 #. module: account
 #: field:account.analytic.account,name:0
@@ -4555,7 +4555,7 @@ msgstr "辅助核算项统计"
 msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
-msgstr "将根据选择的模板自动设置你的科目一览表、银行帐号、税和记录集合"
+msgstr "将根据选择的模板自动设置你的科目一览表、银行科目、税和记录集合"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5182,7 +5182,7 @@ msgstr "从手动转为草稿"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
 msgid "This Month"
-msgstr "本月"
+msgstr "这月"
 
 #. module: account
 #: field:account.account.type,sign:0
@@ -5209,7 +5209,7 @@ msgstr "在确认对帐单产生的会计分录"
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Use Model"
-msgstr "使用模型"
+msgstr "使用模式"
 
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,end:0
@@ -5463,7 +5463,7 @@ msgstr "科目.税.模板"
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Bank Accounts"
-msgstr "银行帐号"
+msgstr "银行科目"
 
 #. module: account
 #: constraint:account.period:0
@@ -5739,7 +5739,7 @@ msgstr "打印记录集合 -"
 #: field:account.chart.template,bank_account_view_id:0
 #: field:account.invoice,partner_bank:0
 msgid "Bank Account"
-msgstr "银行帐号"
+msgstr "银行科目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
diff --git a/addons/account/installer.py b/addons/account/installer.py
index aec82032e9a..cd613f7a6be 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -33,8 +33,9 @@ class account_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     def _get_default_accounts(self, cr, uid, context=None):
-        accounts = [{'acc_name':'Current','account_type':'cash'},
-                    {'acc_name':'Deposit','account_type':'cash'}]
+        accounts = [{'acc_name':'Current','account_type':'bank'},
+                    {'acc_name':'Deposit','account_type':'bank'},
+                    {'acc_name':'Cash','account_type':'cash'}]
         return accounts
 
     def _get_charts(self, cr, uid, context=None):
@@ -67,6 +68,12 @@ class account_installer(osv.osv_memory):
         'account_asset':fields.boolean('Assets Management',
             help="Enables asset management in the accounting application, "
                  "including asset categories and usage periods."),
+        'account_voucher':fields.boolean('Voucher Management',
+            help="Account Voucher module includes all the basic requirements of "
+                 "Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc... "),
+        'account_voucher_payment':fields.boolean('Voucher and Reconcile Management',
+            help="Extension Account Voucher module includes allows to link payment / receipt "
+                 "entries with voucher, also automatically reconcile during the payment and receipt entries."),
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
         'period':fields.selection([('month','Monthly'), ('3months','3 Monthly')],
@@ -74,7 +81,7 @@ class account_installer(osv.osv_memory):
         'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts',required=True),
         'sale_tax':fields.float('Sale Tax(%)'),
         'purchase_tax':fields.float('Purchase Tax(%)')
-        }
+    }
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
@@ -83,7 +90,7 @@ class account_installer(osv.osv_memory):
         'purchase_tax':lambda *a:0.0,
         #'charts':'configurable',
         'bank_accounts_id':_get_default_accounts
-        }
+    }
 
     def on_change_tax(self, cr, uid, id, tax):
         return{'value':{'purchase_tax':tax}}
@@ -108,6 +115,7 @@ class account_installer(osv.osv_memory):
         obj_acc_template = self.pool.get('account.account.template')
         obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
         obj_fiscal_position = self.pool.get('account.fiscal.position')
+        data_pool = self.pool.get('ir.model.data')
         company_id = self.pool.get('res.users').browse(cr, uid, [uid], context)[0].company_id
         seq_journal = True
 
@@ -289,9 +297,12 @@ class account_installer(osv.osv_memory):
                     'account_paid_id': acc_template_ref[value['account_paid_id']],
                 })
 
-        # Creating Journals
+        # Creating Journals Sales and Purchase
         vals_journal={}
-        view_id = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Journal View')])[0]
+        data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
+        data = mod_obj.browse(cr, uid, data_id[0])
+        view_id = data.res_id
+        
         seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0]
 
         if seq_journal:
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 423c39deea1..1816f4c31bf 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -219,8 +219,8 @@ class account_invoice(osv.osv):
 
     _name = "account.invoice"
     _description = 'Invoice'
-    _order = "number"
-    _log_create = True
+    _order = "id"
+
     _columns = {
         'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}),
@@ -231,24 +231,25 @@ class account_invoice(osv.osv):
             ('in_refund','Supplier Refund'),
             ],'Type', readonly=True, select=True, change_default=True),
 
+#        'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
         'number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
         'reference': fields.char('Invoice Reference', size=64, help="The partner reference of this invoice."),
         'reference_type': fields.selection(_get_reference_type, 'Reference Type',
             required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'comment': fields.text('Additional Information', translate=True),
+        'comment': fields.text('Additional Information'),
 
         'state': fields.selection([
             ('draft','Draft'),
             ('proforma','Pro-forma'),
             ('proforma2','Pro-forma'),
             ('open','Open'),
-            ('paid','Done'),
+            ('paid','Paid'),
             ('cancel','Cancelled')
             ],'State', select=True, readonly=True,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \
             \n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \
             \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
-            \n* The \'Done\' state is set automatically when invoice is paid.\
+            \n* The \'Paid\' state is set automatically when invoice is paid.\
             \n* The \'Cancelled\' state is used when user cancel invoice.'),
         'date_invoice': fields.date('Date Invoiced', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, help="Keep empty to use the current date"),
         'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]},
@@ -299,8 +300,8 @@ class account_invoice(osv.osv):
                 'account.move.line': (_get_invoice_from_line, None, 50),
                 'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
             }, help="The Ledger Postings of the invoice have been reconciled with Ledger Postings of the payment(s)."),
-        'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
-            help='The bank account to pay to or to be paid from', readonly=True, states={'draft':[('readonly',False)]}),
+        'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
+            help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Parner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
         'move_lines':fields.function(_get_lines , method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
         'residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual',
             store={
@@ -344,6 +345,9 @@ class account_invoice(osv.osv):
     def create(self, cr, uid, vals, context=None):
         try:
             res = super(account_invoice, self).create(cr, uid, vals, context)
+            for inv_id, name in self.name_get(cr, uid, [res], context=context):
+                message = _('Invoice ') + " '" + name + "' "+ _("is waiting for validation.")
+                self.log(cr, uid, inv_id, message)
             return res
         except Exception, e:
             if '"journal_id" viol' in e.args[0]:
@@ -354,9 +358,6 @@ class account_invoice(osv.osv):
 
     def confirm_paid(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'paid'}, context=context)
-        for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Document ') + " '" + name + "' "+ _("has been paid.")
-            self.log(cr, uid, id, message)
         return True
 
     def unlink(self, cr, uid, ids, context=None):
@@ -373,8 +374,8 @@ class account_invoice(osv.osv):
 #   def get_invoice_address(self, cr, uid, ids):
 #       res = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice'])
 #       return [{}]
-    def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank=False, company_id=False):
+    def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         invoice_addr_id = False
         contact_addr_id = False
         partner_payment_term = False
@@ -429,7 +430,7 @@ class account_invoice(osv.osv):
         }
 
         if type in ('in_invoice', 'in_refund'):
-            result['value']['partner_bank'] = bank_id
+            result['value']['partner_bank_id'] = bank_id
 
         if payment_term != partner_payment_term:
             if partner_payment_term:
@@ -439,7 +440,7 @@ class account_invoice(osv.osv):
             else:
                 result['value']['date_due'] = False
 
-        if partner_bank != bank_id:
+        if partner_bank_id != bank_id:
             to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
             result['value'].update(to_update['value'])
         return result
@@ -474,7 +475,7 @@ class account_invoice(osv.osv):
     def onchange_invoice_line(self, cr, uid, ids, lines):
         return {}
 
-    def onchange_partner_bank(self, cursor, user, ids, partner_bank):
+    def onchange_partner_bank(self, cursor, user, ids, partner_bank_id=False):
         return {'value': {}}
 
     def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line, currency_id):
@@ -769,7 +770,7 @@ class account_invoice(osv.osv):
         context = {}
         for inv in self.browse(cr, uid, ids):
             if not inv.journal_id.invoice_sequence_id:
-                raise osv.except_osv(_('Error !'), _('Please define invoice sequence on invoice journal'))
+                raise osv.except_osv(_('Error !'), _('Please define sequence on invoice journal'))
             if not inv.invoice_line:
                 raise osv.except_osv(_('No Invoice Lines !'), _('Please create some invoice lines.'))
             if inv.move_id:
@@ -875,7 +876,14 @@ class account_invoice(osv.osv):
 
             line = self.finalize_invoice_move_lines(cr, uid, inv, line)
 
-            move = {'ref': inv.number, 'line_id': line, 'journal_id': journal_id, 'date': date, 'type': entry_type}
+            move = {
+                'ref': inv.number, 
+                'line_id': line, 
+                'journal_id': journal_id, 
+                'date': date, 
+                'type': entry_type,
+                'narration':inv.comment
+            }
             period_id=inv.period_id and inv.period_id.id or False
             if not period_id:
                 period_ids= self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d'))])
@@ -890,8 +898,11 @@ class account_invoice(osv.osv):
             new_move_name = self.pool.get('account.move').browse(cr, uid, move_id).name
             # make the invoice point to that move
             self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name})
-            self.pool.get('account.move').post(cr, uid, [move_id])
+            # Pass invoice in context in method post: used if you want to get the same
+            # account move reference when creating the same invoice after a cancelled one:
+            self.pool.get('account.move').post(cr, uid, [move_id], context={'invoice':inv})
         self._log_event(cr, uid, ids)
+
         return True
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):
@@ -916,23 +927,27 @@ class account_invoice(osv.osv):
         }
 
     def action_number(self, cr, uid, ids, *args):
+#        #TODO: not correct fix but required a frech values before reading it.
+#        self.write(cr, uid, ids, {})
+#        
         cr.execute('SELECT id, type, number, move_id, reference ' \
-                    'FROM account_invoice ' \
-                    'WHERE id IN %s',
-                    (tuple(ids),))
+                'FROM account_invoice ' \
+                'WHERE id IN ('+','.join(map(str,ids))+')')
         obj_inv = self.browse(cr, uid, ids)[0]
+        
         for (id, invtype, number, move_id, reference) in cr.fetchall():
             if not number:
                 if obj_inv.journal_id.invoice_sequence_id:
                     sid = obj_inv.journal_id.invoice_sequence_id.id
                     number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id})
                 else:
-                    number = self.pool.get('ir.sequence').get(cr, uid,
-                            'account.invoice.' + invtype)
+                    number = self.pool.get('ir.sequence').get(cr, uid, 'account.invoice.' + invtype)
+                
                 if invtype in ('in_invoice', 'in_refund'):
                     ref = reference
                 else:
                     ref = self._convert_ref(cr, uid, number)
+                
                 cr.execute('UPDATE account_invoice SET number=%s ' \
                         'WHERE id=%s', (number, id))
                 cr.execute('UPDATE account_move SET ref=%s ' \
@@ -946,6 +961,11 @@ class account_invoice(osv.osv):
                         'WHERE account_move_line.move_id = %s ' \
                             'AND account_analytic_line.move_id = account_move_line.id',
                             (ref, move_id))
+                            
+            for inv_id, name in self.name_get(cr, uid, [id]):
+                message = _('Invoice ') + " '" + name + "' "+ _("is validated.")
+                self.log(cr, uid, inv_id, message)
+                
         return True
 
     def action_cancel(self, cr, uid, ids, *args):
@@ -1161,12 +1181,18 @@ class account_invoice(osv.osv):
                    ((move_id, invoice.move_id.id),))
         lines = line.browse(cr, uid, map(lambda x: x[0], cr.fetchall()) )
         for l in lines+invoice.payment_ids:
-            if l.account_id.id==src_account_id:
+            if l.account_id.id == src_account_id:
                 line_ids.append(l.id)
                 total += (l.debit or 0.0) - (l.credit or 0.0)
+
+        inv_id, name = self.name_get(cr, uid, [invoice.id], context=context)[0]
         if (not round(total,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))) or writeoff_acc_id:
+            self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is totally paid."))
             self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
         else:
+            code = invoice.currency_id.code
+            amt = str(pay_amount) + code + ' on ' + str(invoice.amount_total) + code + ' (' + str(total) + code + ' remaining)'
+            self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is paid partially: ") + amt)
             self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context)
 
         # Update the stored value (fields.function), so we write to trigger recompute
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 1c1ae438094..609b8f0da5a 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -10,7 +10,7 @@
                 <form string="Fiscal Position">
                     <field name="name" select="1"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-					<separator string="Mapping" colspan="4"/>
+                    <separator string="Mapping" colspan="4"/>
                     <newline/>
                     <field name="tax_ids" colspan="2" widget="one2many_list" nolabel="1">
                         <tree string="Tax Mapping" editable="bottom">
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index c69b8008961..172de7b7b1c 100644
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -125,9 +125,9 @@
             <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
         </record>
         
-        <record id="account.t5" model="workflow.transition">
-            <field name="role_id" ref="res_roles_invoice0"/>
-        </record>
+<!--        <record id="account.t5" model="workflow.transition">-->
+<!--            <field name="role_id" ref="res_roles_invoice0"/>-->
+<!--        </record>-->
         
         <record id="process_transition_confirmstatementfromdraft0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
@@ -154,7 +154,7 @@
             <field eval="&quot;&quot;&quot;Draft invoices are checked, validated and printed.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoiceinvoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_draftinvoices0"/>
-            <field eval="[(6,0,[ref('account.t5')])]" name="transition_ids"/>
+            <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
         </record>
     
         <record id="process_transition_validentries0" model="process.transition">
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index b3ec1676691..e24431c48b4 100644
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -124,7 +124,7 @@
             <field eval="&quot;&quot;&quot;Draft invoices are validated. &quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierinvoiceinvoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplierdraftinvoices0"/>
-            <field eval="[(6,0,[ref('account.t5')])]" name="transition_ids"/>
+            <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
         </record>
     
         <record id="process_transition_suppliervalidentries0" model="process.transition">
diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index 98fcb8fa370..3727f7741bf 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <record id="analytic_root" model="account.analytic.account">
-            <field name="name">Analytic Chart</field>
+            <field name="name" model="res.company" use="name" search="[('id', '=', 1)]"/>
             <field name="code">0</field>
         </record>
         <record id="analytic_absences" model="account.analytic.account">
@@ -163,7 +163,7 @@
             <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
         </record>
         <record id="analytic_tiny_at_work" model="account.analytic.account">
-            <field name="name">Tiny AT Work</field>
+            <field name="name">OpenERP SA AT Work</field>
             <field name="code">15</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_tinyatwork"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index f36baf8a07d..65223706f40 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -23,25 +23,25 @@
             <field name="model">account.analytic.account</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Analytic Account">
-	           		<group col="8" colspan="4">
-	            		<filter icon="terp-check" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
-	            		<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
-						<separator orientation="vertical"/>
-						<field name="name" select="1"/>
-						<field name="code" select="1"/>
-						<field name="partner_id" select="1"/>
-						<field name="user_id" widget="selection"/>
-	           		</group>
-	            	<newline/>
-	            	<group expand="0" string="Group By...">
-	                        <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
-	                        <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
-	                        <separator orientation="vertical"/>
-	                        <filter string="Associated Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-	                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                <search string="Analytic Account">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-check" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
+                        <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="partner_id" select="1"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
-            	</search>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Associated Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -54,17 +54,17 @@
                 <tree toolbar="True" colors="red:(date&lt;=current_date);black:(date&gt;current_date)" string="Analytic account">
                     <field name="name"/>
                     <field name="code"/>
-                    <field name="date"/>
-                    <field name="company_currency_id"/>
+                    <field name="quantity"/>
+                    <field name="quantity_max"/>
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
-                    <field name="quantity"/>
-                    <field name="quantity_max"/>
-                    <field name="parent_id" invisible="1"/>
-                    <field name="type" invisible="1"/>
-                    <field name="partner_id" invisible="1"/> 
-                    <field name="user_id" invisible="1"/>
+                    <field name="company_currency_id"/>
+<!--                    <field name="date"/>-->
+<!--                    <field name="parent_id" invisible="1"/>-->
+<!--                    <field name="type" invisible="1"/>-->
+<!--                    <field name="partner_id" invisible="1"/>-->
+<!--                    <field name="user_id" invisible="1"/>-->
                 </tree>
             </field>
         </record>
@@ -109,13 +109,13 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph,form</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
-			<field name="context">{"search_default_user_id":uid}</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
         <!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
-        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic"/>
+        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting"/>
 
-		<record id="act_account_renew_view" model="ir.actions.act_window">
+        <record id="act_account_renew_view" model="ir.actions.act_window">
             <field name="name">Accounts to Renew</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
@@ -131,8 +131,9 @@
             <field name="res_model">account.analytic.account</field>
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
-             <field name="view_mode">form,graph</field>
+            <field name="view_mode">form,graph</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
+            <field name="help">Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project.</field>
         </record>
 <!--        <menuitem-->
 <!--            action="action_account_analytic_account_tree2"-->
@@ -140,7 +141,7 @@
 <!--            parent="account_analytic_def_account"/>-->
 <!--        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>-->
 
-<!--		<wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
+<!--        <wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
         <menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>-->
 
         <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
@@ -199,22 +200,26 @@
             <field name="model">account.analytic.line</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Search Analytic Lines">
-            		<group col='6' colspan='4'>
+                <search string="Search Analytic Lines">
+                    <group col='6' colspan='4'>
                         <field name="name" select="1"/>
-                        <field name="journal_id" select="1"/>
                         <field name="account_id" select="1"/>
+                        <field name="amount" select="1"/>
                         <field name="date" select="1"/>
                         <field name="user_id" widget="selection"/>
-            		</group>
-            		<newline/>
-            		<group string="Group By..." expand="0">
-            			<filter string="General Account" context="{'group_by':'general_account_id'}"/>
-                    	<filter string="Analytic Account" context="{'group_by':'account_id'}"/>
-                    	<filter string="Analytic Journal" context="{'group_by':'journal_id'}"/>
-                    	<filter string="Product" context="{'group_by':'product_id'}"/>
-            		</group>
-            	</search>
+                    </group>
+                    <newline/>
+                    <group col='6' colspan='4'>
+                        <field name="journal_id" select="1" widget="selection"/>
+                    </group>
+                    <newline/>
+                    <group string="Group By..." expand="0">
+                        <filter string="General Account" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Analytic Account" context="{'group_by':'account_id'}"/>
+                        <filter string="Analytic Journal" context="{'group_by':'journal_id'}"/>
+                        <filter string="Product" context="{'group_by':'product_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
         <record id="action_account_analytic_line_form" model="ir.actions.act_window">
@@ -297,16 +302,16 @@
             </field>
         </record>
 
-		<record id="view_analytic_journal_search" model="ir.ui.view">
+        <record id="view_analytic_journal_search" model="ir.ui.view">
             <field name="name">account.analytic.journal.search</field>
             <field name="model">account.analytic.journal</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="analytic Journals">
-	            	<group expand="0" string="Group By...">
+                <search string="analytic Journals">
+                    <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
                     </group>
-            	</search>
+                </search>
             </field>
         </record>
 
@@ -330,7 +335,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,search</field>
         </record>
-        <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic"/>
+        <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting"/>
 
         #
         # Open journal entries
@@ -376,6 +381,7 @@
             <field name="name">Print Analytic Journals</field>
             <field name="res_model">account.analytic.journal</field>
             <field name="view_type">tree</field>
+            <field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
         </record>
         <menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
 
@@ -444,14 +450,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Entries Stats">
-                	<group col="8" colspan="4">
-	                	<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
-		               	<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
-		               	<separator orientation="vertical"/>
-	                    <field name="name" select="1"/>
-	               		<field name="month" select="1"/>
-	                    <field name="account_id" select="1"/>
-					</group>
+                    <group col="8" colspan="4">
+                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
+                           <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
+                           <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                           <field name="month" select="1"/>
+                        <field name="account_id" select="1"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -463,7 +469,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="report_hr_timesheet_invoice_journal_search"/>
         </record>
-        <menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="account.next_id_40"/>
+<!--        <menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="account.next_id_40"/>-->
 
         <act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal" name="All Analytic Entries" res_model="account.analytic.line" src_model="account.analytic.account" view_mode="tree,form" view_type="form"/>
 
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index af1f49467c7..da0269c227f 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -71,7 +71,7 @@
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended options..." groups="base.group_extended">
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
 					<field name="currency_id" widget="selection"/>
 					<field name="general_account_id" widget="selection"/>
 					<field name="product_uom_id" widget="selection"/>
@@ -104,6 +104,7 @@
         <field name="view_mode">tree,graph</field>
         <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_analytic_entries_report_search"/>
+        <field name="help">A tool search lets you know statistics on your analytics records that match your needs.</field>
     </record>
 
     <menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement"  sequence="4"/>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 927bba3e228..1ad686ff5b7 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">account.entries.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Entries Analysis">
+            <tree colors="blue:state in ('draft');black:state in ('posted')" string="Entries Analysis">
                 <field name="date" invisible="1"/>
                 <field name="date_created" invisible="1"/>
                 <field name="date_maturity" invisible="1"/>
@@ -93,7 +93,7 @@
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                  </group>
                  <newline/>
-                 <group expand="0" string="Extended options..." groups="base.group_extended">
+                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
                     <field name="journal_id"/>
                     <field name="fiscalyear_id"/>
                     <field name="period_id"/>
@@ -118,6 +118,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="context">{'search_default_profit': 1,'search_default_group_account':1,'search_default_group_month': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="help">A tool search lets you know statistics on your different financial accounts that match your needs.</field>
     </record>
     <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statistic_report_statement" sequence="2"/>
 </data>
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index a06c59da06a..825fdeaa44f 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -68,7 +68,7 @@ class account_invoice_report(osv.osv):
         'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
         'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
         'account_id': fields.many2one('account.account', 'Account',readonly=True),
-        'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
+        'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual':fields.float('Total Residual', readonly=True),
         'delay_to_pay':fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
     }
@@ -101,7 +101,7 @@ class account_invoice_report(osv.osv):
                     ai.address_contact_id as address_contact_id,
                     ai.address_invoice_id as address_invoice_id,
                     ai.account_id as account_id,
-                    ai.partner_bank as partner_bank,
+                    ai.partner_bank_id as partner_bank_id,
                     sum(case when ai.type in ('out_refund','in_invoice') then
                          ail.quantity * u.factor * -1
                         else
@@ -152,7 +152,7 @@ class account_invoice_report(osv.osv):
                     ai.address_contact_id,
                     ai.address_invoice_id,
                     ai.account_id,
-                    ai.partner_bank,
+                    ai.partner_bank_id,
                     ai.residual
             )
         """)
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index d03e977336b..2bd3018ff7c 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">account.invoice.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Invoices Analysis">
+            <tree colors="blue:state in ('draft');gray:state in ('cancel','paid');black:state in ('proforma','proforma2')"  string="Invoices Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -25,7 +25,7 @@
                 <field name="date_due" invisible="1"/>
                 <field name="address_contact_id" invisible="1"/>
                 <field name="address_invoice_id" invisible="1"/>
-                <field name="partner_bank" invisible="1"/>
+                <field name="partner_bank_id" invisible="1"/>
                 <field name="account_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="Qty"/>
@@ -113,7 +113,7 @@
                     <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended options..." groups="base.group_extended">
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
                     <field name="product_id"/>
                     <field name="account_id"/>
                     <separator orientation="vertical"/>
@@ -138,6 +138,8 @@
         <field name="view_mode">tree,graph</field>
         <field name="context">{'search_default_month':1,'search_default_product':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
+        <field name="help">A tool search lets you know statistics on invoices that match your needs.</field>
+
     </record>
 
     <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statistic_report_statement" sequence="0"/>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index 190ff856c8a..96b49f0247e 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -89,7 +89,7 @@
             <field name="model">report.invoice.created</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state not in ('draft') " string="Invoices">
+                <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in('paid','cancel') " string="Invoices">
                    	<field name="create_date" select="1"/>
                     <field name="name" select="1"/>
                     <field name="type"/>
diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index 32186c269f9..c7153e65921 100644
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -266,7 +266,7 @@ class general_ledger(rml_parse.rml_parse):
             JOIN account_journal j on (l.journal_id=j.id)
             WHERE %s AND l.account_id = %%s AND l.date<=%%s AND l.date>=%%s ORDER by %s
         """ % (self.query, sql_sort)
-        self.cr.execute(sql, (account.id,  self.date_borne['max_date'], self.date_borne['min_date']))
+        self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date']))
         res = self.cr.dictfetchall()
         account_sum = 0.0
         account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
diff --git a/addons/account/report/report_balance_sheet.rml b/addons/account/report/report_balance_sheet.rml
index c540e16f58e..20f52cdd2f2 100644
--- a/addons/account/report/report_balance_sheet.rml
+++ b/addons/account/report/report_balance_sheet.rml
@@ -186,7 +186,7 @@
           <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -196,7 +196,7 @@
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(sum_dr()) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -221,10 +221,10 @@
           <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('asset'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_9">[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
+          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -234,7 +234,7 @@
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(sum_cr()) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/report_balance_sheet_horizontal.rml b/addons/account/report/report_balance_sheet_horizontal.rml
index d9b92da3856..3e60f7bfd2c 100644
--- a/addons/account/report/report_balance_sheet_horizontal.rml
+++ b/addons/account/report/report_balance_sheet_horizontal.rml
@@ -197,7 +197,7 @@
 	        <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
 	      </td>
 	      <td>
-	        <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
+	        <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]]</para>
 	      </td>
 	      <td>
 	        <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font><font>[[ a['code1'] ]]</font></para>
@@ -206,7 +206,7 @@
 	        <para style="terp_default_9"><font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name1'] ]]</font></para>
 	      </td>
 	      <td>
-	        <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]]</para>
+	        <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(get_abs(a['balance1'])) or 0.0 ]]</para>
 	      </td>
 	   </tr>
       </blockTable>
@@ -216,13 +216,13 @@
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]]</u></para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/report_bs.py b/addons/account/report/report_bs.py
index 5a7294338c5..04fafd7ed30 100644
--- a/addons/account/report/report_bs.py
+++ b/addons/account/report/report_bs.py
@@ -37,6 +37,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
         self.result_temp=[]
         self.localcontext.update({
             'time': time,
+            'get_abs' : self.get_abs,
             'get_lines' : self.get_lines,
             'get_lines_another' : self.get_lines_another,
             'get_company': self.get_company,
@@ -48,6 +49,9 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
             
         })
         self.context = context
+
+    def get_abs(self,amount):
+        return abs(amount)
         
     def sum_dr(self):
         if self.res_pl['type'] == 'Net Profit':
diff --git a/addons/account/report/report_pl.py b/addons/account/report/report_pl.py
index c693b9940c9..e78639cff83 100644
--- a/addons/account/report/report_pl.py
+++ b/addons/account/report/report_pl.py
@@ -35,6 +35,7 @@ class report_pl_account_horizontal(rml_parse.rml_parse):
         self.result_temp=[]
         self.localcontext.update( {
             'time': time,
+            'get_abs' : self.get_abs,
             'get_lines' : self.get_lines,
             'get_lines_another' : self.get_lines_another,
             'get_company': self.get_company,
@@ -45,7 +46,10 @@ class report_pl_account_horizontal(rml_parse.rml_parse):
             'final_result' : self.final_result,
         })
         self.context = context
-        
+       
+    def get_abs(self,amount):
+        return abs(amount)
+     
     def final_result(self):
         return self.res_pl
     
diff --git a/addons/account/report/report_pl_account.rml b/addons/account/report/report_pl_account.rml
index 6e72a198115..80aa4b97701 100644
--- a/addons/account/report/report_pl_account.rml
+++ b/addons/account/report/report_pl_account.rml
@@ -201,7 +201,7 @@
           </para>
         </td>
          <td>
-          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(get_abs(a.balance)) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -214,7 +214,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(get_abs(final_result()['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -224,7 +224,7 @@
           <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -256,7 +256,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(get_abs(a.balance)) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -269,7 +269,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(get_abs(final_result()['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -279,7 +279,7 @@
           <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/report_pl_account_horizontal.rml b/addons/account/report/report_pl_account_horizontal.rml
index b68d375d3be..35e4ff47268 100644
--- a/addons/account/report/report_pl_account_horizontal.rml
+++ b/addons/account/report/report_pl_account_horizontal.rml
@@ -214,7 +214,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]]</para>
           </td>
           <td>
             <para style="terp_default_9">
@@ -227,7 +227,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(get_abs(a['balance1'])) or 0.0 ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -240,7 +240,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(get_abs(final_result()['balance'])) or 0.0 ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9"></para>
@@ -249,7 +249,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(get_abs(final_result()['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -260,13 +260,13 @@
           <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]]</u></para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 4337bdc61af..b9d2f8377c0 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -62,6 +62,7 @@
 "access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,1,1,1
 "access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0
 "access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
+"access_account_fiscalyear_partner_manager","account.fiscalyear.partnermanager","model_account_fiscalyear","base.group_partner_manager",1,0,0,0
 "access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1
 "access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
 "access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0
@@ -91,3 +92,5 @@
 "access_account_account_report_manager","account.account.report","model_account_account_report","account.group_account_manager",1,0,0,0
 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,0,0,0
 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
+"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
+"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,0,0,0
diff --git a/addons/account/sequence.py b/addons/account/sequence.py
index c90e9ef93c7..b75e7f3e34e 100644
--- a/addons/account/sequence.py
+++ b/addons/account/sequence.py
@@ -19,19 +19,23 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
 
 class ir_sequence_fiscalyear(osv.osv):
     _name = 'account.sequence.fiscalyear'
     _rec_name = "sequence_main_id"
     _columns = {
-        "sequence_id": fields.many2one("ir.sequence", 'Sequence', required=True, ondelete='cascade'),
-        "sequence_main_id": fields.many2one("ir.sequence", 'Main Sequence', required=True, ondelete='cascade'),
-        "fiscalyear_id": fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, ondelete='cascade')
+        "sequence_id": fields.many2one("ir.sequence", 'Sequence', required=True,
+            ondelete='cascade'),
+        "sequence_main_id": fields.many2one("ir.sequence", 'Main Sequence',
+            required=True, ondelete='cascade'),
+        "fiscalyear_id": fields.many2one('account.fiscalyear', 'Fiscal Year',
+            required=True, ondelete='cascade')
     }
 
     _sql_constraints = [
-        ('main_id', 'CHECK (sequence_main_id != sequence_id)',  'Main Sequence must be different from current !'),
+        ('main_id', 'CHECK (sequence_main_id != sequence_id)',
+            'Main Sequence must be different from current !'),
     ]
 
 ir_sequence_fiscalyear()
@@ -39,17 +43,25 @@ ir_sequence_fiscalyear()
 class ir_sequence(osv.osv):
     _inherit = 'ir.sequence'
     _columns = {
-        'fiscal_ids' : fields.one2many('account.sequence.fiscalyear', 'sequence_main_id', 'Sequences')
+        'fiscal_ids' : fields.one2many('account.sequence.fiscalyear',
+            'sequence_main_id', 'Sequences')
     }
-    def get_id(self, cr, uid, sequence_id, test='id', context={}):
-        cr.execute('select id from ir_sequence where '+test+'=%s and active=%s', (sequence_id, True,))
+    def get_id(self, cr, uid, sequence_id, test='id', context=None):
+        if context is None:
+            context = {}
+        cr.execute('select id from ir_sequence where ' 
+                   + test + '=%s and active=%s', (sequence_id, True,))
         res = cr.dictfetchone()
         if res:
-            for line in self.browse(cr, uid, res['id'], context=context).fiscal_ids:
-                if line.fiscalyear_id.id==context.get('fiscalyear_id', False):
-                    return super(ir_sequence, self).get_id(cr, uid, line.sequence_id.id, test="id", context=context)
-        return super(ir_sequence, self).get_id(cr, uid, sequence_id, test, context)
+            for line in self.browse(cr, uid, res['id'],
+                                    context=context).fiscal_ids:
+                if line.fiscalyear_id.id == context.get('fiscalyear_id', False):
+                    return super(ir_sequence, self).get_id(cr, uid,
+                                                           line.sequence_id.id,
+                                                           test="id",
+                                                           context=context)
+        return super(ir_sequence, self).get_id(cr, uid, sequence_id, test,
+                                               context=context)
 ir_sequence()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/sequence_view.xml b/addons/account/sequence_view.xml
index 2d4d159cb41..fe34590e78b 100644
--- a/addons/account/sequence_view.xml
+++ b/addons/account/sequence_view.xml
@@ -12,8 +12,12 @@
                         <field name="fiscal_ids" nolabel="1" colspan="4">
                             <tree string="Fiscal Year Sequences" editable="bottom">
                                 <field name="fiscalyear_id"/>
-                                <field name="sequence_id"/>
+                                <field name="sequence_id" domain="[('code','=',parent.code)]"/>
                             </tree>
+                            <form string="Fiscal Year Sequence">
+                                <field name="fiscalyear_id"/>
+                                <field name="sequence_id" domain="[('code','=',parent.code)]"/>
+                            </form>
                         </field>
                     </page>
                 </page>
diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml
index 0cbcc0f944d..e5920d0caed 100644
--- a/addons/account/test/account_customer_invoice.yml
+++ b/addons/account/test/account_customer_invoice.yml
@@ -32,6 +32,12 @@
 -
   !assert {model: account.invoice, id: account_invoice_customer0}:
     - state == 'proforma2'
+-
+  I check that there is no move attached to the invoice
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
+    assert acc_id.move_id, "Move not created"
 -
   I create invoice by clicking on Create button
 -
@@ -41,6 +47,13 @@
 -
   !assert {model: account.invoice, id: account_invoice_customer0}:
     - state == 'open'
+    
+-
+  I check that now there is a move attached to the invoice
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
+    assert acc_id.move_id, "Move created"
 -
   I create a record for partial payment of 1000 EUR.
 -
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 6a619a8df5c..fa4f24effc1 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -59,33 +59,33 @@
       "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
       })
 
--
-  In order to test Cancel Opening Entries I cancelled the opening entries created for "Fiscal Year 2011"
--
-  !record {model: account.open.closed.fiscalyear, id: account_open_closed_fiscalyear_1}:
-    fyear_id: account.data_fiscalyear
--
-  I clicked on Open button
--
-  !python {model: account.open.closed.fiscalyear}: |
-    self.remove_entries(cr, uid, [ref("account_open_closed_fiscalyear_1")], {"lang":
-      'en_US', "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_open_closed_fy")],
-      "tz": False, "active_id": ref("account.menu_wizard_open_closed_fy"), })
--
-  I check the opening entries By using "Entries by Line wizard"
--
-  !record {model: account.move.journal, id: account_move_journal_2}:
-    journal_id: account.sales_journal
-    period_id: account_period_jan11
-
--
-  I checked the Opening entries are cancelled successfully
--
-  !python {model: account.move.journal}: |
-    self.action_open_window(cr, uid, [ref("account_move_journal_2")], {"lang": 'en_US',
-      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_move_journal_line_form")],
-      "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
-      })
+#-
+#  In order to test Cancel Opening Entries I cancelled the opening entries created for "Fiscal Year 2011"
+#-
+#  !record {model: account.open.closed.fiscalyear, id: account_open_closed_fiscalyear_1}:
+#    fyear_id: account.data_fiscalyear
+#-
+#  I clicked on Open button
+#-
+#  !python {model: account.open.closed.fiscalyear}: |
+#    self.remove_entries(cr, uid, [ref("account_open_closed_fiscalyear_1")], {"lang":
+#      'en_US', "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_open_closed_fy")],
+#      "tz": False, "active_id": ref("account.menu_wizard_open_closed_fy"), })
+#-
+#  I check the opening entries By using "Entries by Line wizard"
+#-
+#  !record {model: account.move.journal, id: account_move_journal_2}:
+#    journal_id: account.sales_journal
+#    period_id: account_period_jan11
+#
+#-
+#  I checked the Opening entries are cancelled successfully
+#-
+#  !python {model: account.move.journal}: |
+#    self.action_open_window(cr, uid, [ref("account_move_journal_2")], {"lang": 'en_US',
+#      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_move_journal_line_form")],
+#      "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
+#      })
 
 
 
diff --git a/addons/account/test/account_sequence_test.yml b/addons/account/test/account_sequence_test.yml
new file mode 100644
index 00000000000..3be824d2ca0
--- /dev/null
+++ b/addons/account/test/account_sequence_test.yml
@@ -0,0 +1,45 @@
+- In order to test the invoice numbering, I create a sequence for out invoices.
+- !record {model: ir.sequence, id: seq_out_invoice_test}:
+    name: Account Invoice Out for the demonstration Fiscal Year # XXX indicate the name of the fiscal year
+    code: account.invoice.out_invoice
+    padding: 3
+    prefix: FY-
+    suffix: -TEST
+    number_next: 42
+
+- I link the new sequence to the demo sequence and the demo fiscal years.
+- !record {model: account.sequence.fiscalyear, id: seq_out_invoice_test_fy}:
+    sequence_id: seq_out_invoice_test
+    sequence_main_id: seq_out_invoice
+    fiscalyear_id: data_fiscalyear
+
+- I create a draft customer invoice in a period of the demo fiscal year
+- !record {model: account.invoice, id: invoice_seq_test}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_zen
+    address_invoice_id: base.res_partner_address_zen
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC3] Medium PC'
+        price_unit: 900.0
+        quantity: 10.0
+        product_id: product.product_product_pc3
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_3
+    reference_type: none
+    period_id: period_1
+    
+- I create the invoice, as is I clicked on the "Create" button
+- !workflow {model: account.invoice, action: invoice_open, ref: invoice_seq_test}
+
+- I check that the invoice state is "Open"
+- !assert {model: account.invoice, id: invoice_seq_test}:
+    - state == 'open'
+    
+- I check that the invoice got the right number using our sequence
+  # This used to fail because of bug #602188
+- !assert {model: account.invoice, id: invoice_seq_test}:
+    - number == 'FY-042-TEST'
diff --git a/addons/account/test/chart_of_account.yml b/addons/account/test/chart_of_account.yml
index 39d7428ea73..09271f778be 100644
--- a/addons/account/test/chart_of_account.yml
+++ b/addons/account/test/chart_of_account.yml
@@ -25,21 +25,19 @@
       "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_account_tree2")],
       "tz": False, "active_id": ref("account.menu_action_account_tree2"), })
 
--
-  In order to test Account Move Line Wizard I check the move line entries using this wizard
--
-  !record {model: account.move.line.select, id: account_move_line_select_0}:
-    {}
--
-  I clicked on Button to open the account move lines
--
-  !python {model: account.move.line.select}: |
-    self.open_window(cr, uid, [ref("account_move_line_select_0")], {"lang": 'en_US',
-      "state": "all", "tz": False, "active_model": "account.account", "active_ids":
-      [ref("account.a_recv")], "fiscalyear": 1, "active_id": ref("account.a_recv"),
-      })
-
-
+#-
+#  In order to test Account Move Line Wizard I check the move line entries using this wizard
+#-
+#  !record {model: account.move.line.select, id: account_move_line_select_0}:
+#    {}
+#-
+#  I clicked on Button to open the account move lines
+#-
+#  !python {model: account.move.line.select}: |
+#    self.open_window(cr, uid, [ref("account_move_line_select_0")], {"lang": 'en_US',
+#      "state": "all", "tz": False, "active_model": "account.account", "active_ids":
+#      [ref("account.a_recv")], "fiscalyear": 1, "active_id": ref("account.a_recv"),
+#      })
 -
   In order to test the Analytic Charts of Account wizard I will generate chart
 
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 1dea8e8d4f3..3f6bd126251 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -45,7 +45,9 @@ import account_open_closed_fiscalyear
 import account_compare_account_balance_report
 import account_invoice_state
 import account_chart
-import account_move_line_select
+#TODO: remove this file no moe used 
+# also remove related view fiel
+#import account_move_line_select
 
 import account_validate_account_move
 import account_use_model
diff --git a/addons/account/wizard/account_aged_trial_balance_view.xml b/addons/account/wizard/account_aged_trial_balance_view.xml
index 769d7ee268f..a928524893e 100644
--- a/addons/account/wizard/account_aged_trial_balance_view.xml
+++ b/addons/account/wizard/account_aged_trial_balance_view.xml
@@ -35,6 +35,7 @@
              <field name="view_id" ref="account_aged_balance_view"/>
              <field name="context">{'record_id':active_id}</field>
              <field name="target">new</field>
+             <field name="help">Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, Open ERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). Open ERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. </field>
        </record>
 
  	   <menuitem
diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index 0ee58eeb01a..ef177516718 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -29,15 +29,15 @@ class account_automatic_reconcile(osv.osv_memory):
     _description = 'Automatic Reconcile'
 
     _columns = {
-        'account_ids': fields.many2many('account.account', 'reconcile_account_rel', 'reconcile_id', 'account_id', 'Account to reconcile', domain = [('reconcile','=',1)], \
+        'account_ids': fields.many2many('account.account', 'reconcile_account_rel', 'reconcile_id', 'account_id', 'Accounts to Reconcile', domain = [('reconcile','=',1)], \
                                         help = 'If no account is specified, the reconciliation will be made using every accounts that can be reconcilied'),
         'writeoff_acc_id': fields.many2one('account.account', 'Account'),
         'journal_id': fields.many2one('account.journal', 'Journal'),
         'period_id': fields.many2one('account.period', 'Period'),
         'max_amount': fields.float('Maximum write-off amount'),
         'power': fields.selection([(p, str(p)) for p in range(2, 10)], 'Power', required=True, help='Number of partial amounts that can be combined to find a balance point can be chosen as the power of the automatic reconciliation'),
-        'date1': fields.date('Start of period', required=True),
-        'date2': fields.date('End of period', required=True),
+        'date1': fields.date('Starting Date', required=True),
+        'date2': fields.date('Ending Date', required=True),
         'reconciled': fields.integer('Reconciled transactions', readonly=True),
         'unreconciled': fields.integer('Not reconciled transactions', readonly=True),
         'allow_write_off': fields.boolean('Allow write off')
@@ -54,6 +54,7 @@ class account_automatic_reconcile(osv.osv_memory):
         'date2': time.strftime('%Y-%m-%d'),
         'reconciled': _get_reconciled,
         'unreconciled': _get_unreconciled,
+        'power':2
     }
 
     #TODO: cleanup and comment this code... For now, it is awfulllll
@@ -245,4 +246,4 @@ class account_automatic_reconcile(osv.osv_memory):
 
 account_automatic_reconcile()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index f48fa010ad8..bda89971a3d 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -7,33 +7,33 @@
              <field name="model">account.automatic.reconcile</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-				<form string="Reconciliation">
-					<group width="660" height="430">
-				    <separator string="Options" colspan="4"/>
-				    <group>
-				    <field name="account_ids" colspan="4" domain="[('reconcile','=',1)]"/>
-				    <field name="date1"/>
-				    <field name="date2"/>
-				    <field name="power"/>
-				    <field name="allow_write_off"/>
-				    </group>
-				    <newline/>
-				    <group attrs="{'readonly':[('allow_write_off', '!=', True)]}">
-					    <separator string="Write-Off Move" colspan="4"/>
-					    <field name="max_amount"/>
-					    <field name="writeoff_acc_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
-					    <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
-					    <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
-				    </group>
-				    <separator string ="" colspan="4"/>
-				    <group colspan="2" col="4">
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
- 					</group>
- 				 </group>
-				</form>
+                <form string="Reconciliation">
+                    <group width="660" height="430">
+                    <separator string="Options" colspan="4"/>
+                    <group>
+                    <field name="account_ids" colspan="4" domain="[('reconcile','=',1)]"/>
+                    <field name="date1"/>
+                    <field name="date2"/>
+                    <field name="power"/>
+                    <field name="allow_write_off"/>
+                    </group>
+                    <newline/>
+                    <group attrs="{'readonly':[('allow_write_off', '!=', True)]}">
+                        <separator string="Write-Off Move" colspan="4"/>
+                        <field name="max_amount"/>
+                        <field name="writeoff_acc_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
+                        <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
+                        <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
+                    </group>
+                    <separator string ="" colspan="4"/>
+                    <group colspan="2" col="4">
+                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                           <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
+                     </group>
+                  </group>
+                </form>
              </field>
- 		</record>
+         </record>
 
         <record id="action_account_automatic_reconcile" model="ir.actions.act_window">
              <field name="name">Account Automatic Reconcile</field>
@@ -44,31 +44,32 @@
              <field name="view_id" ref="account_automatic_reconcile_view"/>
              <field name="context">{'record_id':active_id}</field>
              <field name="target">new</field>
+             <field name="help">For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP make its own search for entries to reconcile in a series of accounts. It tries to find entries for each partner where the amounts correspond.</field>
        </record>
 
- 	   <menuitem
- 	   		icon="STOCK_EXECUTE"
- 	   		name="Automatic Reconciliation"
- 	   		action="action_account_automatic_reconcile"
- 			id="menu_automatic_reconcile"
- 			parent="periodical_processing_reconciliation"/>
+        <menuitem
+                icon="STOCK_EXECUTE"
+                name="Automatic Reconciliation"
+                action="action_account_automatic_reconcile"
+             id="menu_automatic_reconcile"
+             parent="periodical_processing_reconciliation"/>
 
         <record id="account_automatic_reconcile_view1" model="ir.ui.view">
              <field name="name">Automatic reconcile unreconcile</field>
              <field name="model">account.automatic.reconcile</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-				<form string="Reconciliation result">
-	    			<field name="reconciled"/>
-	    			<newline/>
-	    			<field name="unreconciled"/>
-     				<group colspan="4" col="6">
-                       	<separator colspan="6"/>
-     					<button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
- 					</group>
-				</form>
+                <form string="Reconciliation result">
+                    <field name="reconciled"/>
+                    <newline/>
+                    <field name="unreconciled"/>
+                     <group colspan="4" col="6">
+                           <separator colspan="6"/>
+                         <button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
+                     </group>
+                </form>
              </field>
- 		</record>
+         </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account/wizard/account_balance_report.py b/addons/account/wizard/account_balance_report.py
index 5d02f9fa972..0d2a56d96d6 100644
--- a/addons/account/wizard/account_balance_report.py
+++ b/addons/account/wizard/account_balance_report.py
@@ -109,7 +109,6 @@ class account_balance_report(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'account.account.balance',
             'datas': data,
-            'nodestroy':True,
             }
 
     def _check_date(self, cr, uid, data, context=None):
@@ -128,7 +127,6 @@ class account_balance_report(osv.osv_memory):
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.account.balance',
                 'datas': data,
-                'nodestroy':True,
                     }
         else:
             raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
diff --git a/addons/account/wizard/account_balance_report_view.xml b/addons/account/wizard/account_balance_report_view.xml
index 77c615611d3..7011dadef7d 100644
--- a/addons/account/wizard/account_balance_report_view.xml
+++ b/addons/account/wizard/account_balance_report_view.xml
@@ -7,41 +7,41 @@
              <field name="model">account.balance.report</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-              	<form string="Select period">
-              		<group width="650" height="200">
-				    <field name="company_id" groups="base.group_multi_company"/>
-				    <field name="display_account" required = "True"/>
-				    <newline/>
-				    <field name="fiscalyear"/>
-				    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
-				    <newline/>
-				    <separator string="Filters" colspan="4"/>
-				    <field name="state" required="True"/>
-				    <newline/>
-				    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
-				        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
-				            <separator string="Date Filter" colspan="4"/>
-				            <field name="date_from"/>
-				            <field name="date_to"/>
-				        </group>
-				        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
-				            <separator string="Filter on Periods" colspan="4"/>
-				            <field name="periods" colspan="4" nolabel="1"/>
-				        </group>
-				    </group>
-				    <newline/>
-     				<group colspan="4" col="6">
-                       	<separator colspan="4"/>
-                       	<newline/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
- 					</group>
- 					</group>
-				</form>
+                  <form string="Select period">
+                      <group width="650" height="200">
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="display_account" required = "True"/>
+                    <newline/>
+                    <field name="fiscalyear"/>
+                    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
+                    <newline/>
+                    <separator string="Filters" colspan="4"/>
+                    <field name="state" required="True"/>
+                    <newline/>
+                    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
+                        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+                            <separator string="Date Filter" colspan="4"/>
+                            <field name="date_from"/>
+                            <field name="date_to"/>
+                        </group>
+                        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+                            <separator string="Filter on Periods" colspan="4"/>
+                            <field name="periods" colspan="4" nolabel="1"/>
+                        </group>
+                    </group>
+                    <newline/>
+                     <group colspan="4" col="6">
+                           <separator colspan="4"/>
+                           <newline/>
+                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                           <button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                     </group>
+                     </group>
+                </form>
              </field>
- 		</record>
+         </record>
 
- 		<record id="action_account_balance_report" model="ir.actions.act_window">
+         <record id="action_account_balance_report" model="ir.actions.act_window">
              <field name="name">Account Balance</field>
              <field name="res_model">account.balance.report</field>
              <field name="type">ir.actions.act_window</field>
@@ -51,7 +51,7 @@
              <field name="target">new</field>
        </record>
 
-		<record model="ir.values" id="action_account_balance_report_values">
+        <record model="ir.values" id="action_account_balance_report_values">
             <field name="model_id" ref="account.model_account_account" />
             <field name="object" eval="1" />
             <field name="name">Account Balance</field>
@@ -59,19 +59,19 @@
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_balance_report'))" />
             <field name="key">action</field>
             <field name="model">account.account</field>
-		</record>
+        </record>
 
-		<record id="account_balance_report_account_view" model="ir.ui.view">
+        <record id="account_balance_report_account_view" model="ir.ui.view">
             <field name="name">Account Balance</field>
              <field name="model">account.balance.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-		        <form string="Select Chart">
-		        	<field name="Account_list"/>
-		        	<separator colspan="4"/>
-	            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-		            <button name="next_view" string="Next" type="object" icon="gtk-go-forward" default_focus="1"/>
-		        </form>
+                <form string="Select Chart">
+                    <field name="Account_list"/>
+                    <separator colspan="4"/>
+                <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button name="next_view" string="Next" type="object" icon="gtk-go-forward" default_focus="1"/>
+                </form>
             </field>
         </record>
 
@@ -86,11 +86,11 @@
              <field name="target">new</field>
        </record>
 
- 	   <menuitem icon="STOCK_PRINT"
- 	   		name="Account Balance"
- 	   		action="action_account_balance_account_report"
- 			id="menu_account_balance_report"
- 			parent="account.menu_generic_report"/>
+      <menuitem icon="STOCK_PRINT"
+         name="Account Balance"
+         action="action_account_balance_account_report"
+         id="menu_account_balance_report"
+         parent="account.final_accounting_reports"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account/wizard/account_bs_report.py b/addons/account/wizard/account_bs_report.py
index 27c50b4b880..193e33395f5 100644
--- a/addons/account/wizard/account_bs_report.py
+++ b/addons/account/wizard/account_bs_report.py
@@ -114,14 +114,12 @@ class account_bs_report(osv.osv_memory):
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.balancesheet.horizontal',
                 'datas': data,
-                'nodestroy':True,
                 }
         else:
             return {
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.balancesheet',
                 'datas': data,
-                'nodestroy':True,
                 }
             
     def _check_date(self, cr, uid, data, context=None):
@@ -141,14 +139,12 @@ class account_bs_report(osv.osv_memory):
                         'type': 'ir.actions.report.xml',
                         'report_name': 'account.balancesheet.horizontal',
                         'datas': data,
-                        'nodestroy':True,
                         }
                 else:
                     return {
                         'type': 'ir.actions.report.xml',
                         'report_name': 'account.balancesheet',
                         'datas': data,
-                        'nodestroy':True,
                         }
         else:
             raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
diff --git a/addons/account/wizard/account_central_journal.py b/addons/account/wizard/account_central_journal.py
index b1a0f3c2849..dc213f159ab 100644
--- a/addons/account/wizard/account_central_journal.py
+++ b/addons/account/wizard/account_central_journal.py
@@ -52,7 +52,6 @@ class account_central_journal(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'account.central.journal',
             'datas': datas,
-            'nodestroy':True,
             }
 
 account_central_journal()
diff --git a/addons/account/wizard/account_central_journal_view.xml b/addons/account/wizard/account_central_journal_view.xml
index 6a9526c415e..9c9d687785c 100644
--- a/addons/account/wizard/account_central_journal_view.xml
+++ b/addons/account/wizard/account_central_journal_view.xml
@@ -2,27 +2,27 @@
 <openerp>
     <data>
 
-		<record id="view_account_central_journal" model="ir.ui.view">
+        <record id="view_account_central_journal" model="ir.ui.view">
             <field name="name">Account central Journal</field>
             <field name="model">account.central.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Print Central Journal">
-				<group height="370" width="400">
-				    <group>
-					    <separator string="Journals"/><newline/>
-					    <field name="journal_id" nolabel="1"/><newline/>
-					    <separator string="Periods"/><newline/>
-					    <field name="period_id" nolabel="1"/><newline/>
-					</group>
-					<newline/>
-				    <group>
-			    		<separator colspan="4"/>
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
-					</group>
-				</group>
-			</form>
+            <form string="Print Central Journal">
+                <group height="370" width="400">
+                    <group>
+                        <separator string="Journals"/><newline/>
+                        <field name="journal_id" nolabel="1"/><newline/>
+                        <separator string="Periods"/><newline/>
+                        <field name="period_id" nolabel="1"/><newline/>
+                    </group>
+                    <newline/>
+                    <group>
+                        <separator colspan="4"/>
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+                    </group>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -35,12 +35,12 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem
-	        name="Central Journals"
-	        parent="account.menu_generic_report"
-	        action="action_account_central_journal"
-	        id="menu_account_central_journal"
-	        icon="STOCK_PRINT"/>
+        <menuitem
+            name="Central Journals"
+            parent="account.menu_journals_report"
+            action="action_account_central_journal"
+            id="menu_account_central_journal"
+            icon="STOCK_PRINT"/>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index 440dbd407ec..c9cc5ff7bd5 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -33,7 +33,7 @@ class account_chart(osv.osv_memory):
                                     help = 'Keep empty for all open fiscal years'),
        'target_move': fields.selection([('all', 'All Entries'),
                                         ('posted', 'All Posted Entries')], 'Target Moves', required = True),
-              }
+    }
 
     def _get_fiscalyear(self, cr, uid, context=None):
         """Return default Fiscalyear value"""
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index b621019dbe6..d29bffb833d 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -1,36 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-          <record id="view_account_chart" model="ir.ui.view">
+        <record id="view_account_chart" model="ir.ui.view">
             <field name="name">account.chart.form</field>
             <field name="model">account.chart</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account charts">
                     <group colspan="4" >
-                         <field name="fiscalyear"/>
-                           <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
-                         <field name="target_move"/>
+                        <field name="fiscalyear"/>
+                        <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
+                        <field name="target_move"/>
                     </group>
-                            <separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-                    	<button icon="terp-gtk-go-back-rtl" string="Open Charts"
-                    		name="account_chart_open_window" type="object" />
+                       <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object" />
                     </group>
                 </form>
             </field>
-          </record>
+        </record>
 
         <record id="action_account_chart" model="ir.actions.act_window">
             <field name="name">Chart of Accounts</field>
             <field name="res_model">account.chart</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_chart"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_chart"/>
+            <field name="target">new</field>
         </record>
 
         <menuitem icon="STOCK_INDENT" action="action_account_chart"
diff --git a/addons/account/wizard/account_compare_account_balance_report.py b/addons/account/wizard/account_compare_account_balance_report.py
index af844854271..629e1ae798e 100644
--- a/addons/account/wizard/account_compare_account_balance_report.py
+++ b/addons/account/wizard/account_compare_account_balance_report.py
@@ -74,14 +74,12 @@ class account_compare_account_balance_report(osv.osv_memory):
                     'type': 'ir.actions.report.xml',
                     'report_name': 'account.account.balance.landscape',
                     'datas': data,
-                    'nodestroy':True,
                     }
             else:
                 return {
                     'type': 'ir.actions.report.xml',
                     'report_name': 'account.balance.account.balance',
                     'datas': data,
-                    'nodestroy':True,
                     }
         if data['form']['format_perc']==1:
             if len(data['form']['fiscalyear'])<=2:
@@ -90,14 +88,12 @@ class account_compare_account_balance_report(osv.osv_memory):
                     'type': 'ir.actions.report.xml',
                     'report_name': 'account.account.balance.landscape',
                     'datas': data,
-                    'nodestroy':True,
                     }
                 else:
                     return {
                     'type': 'ir.actions.report.xml',
                     'report_name': 'account.balance.account.balance',
                     'datas': data,
-                    'nodestroy':True,
                     }
             else:
                 if len(data['form']['fiscalyear'])==3:
@@ -106,7 +102,6 @@ class account_compare_account_balance_report(osv.osv_memory):
                             'type': 'ir.actions.report.xml',
                             'report_name': 'account.account.balance.landscape',
                             'datas': data,
-                            'nodestroy':True,
                             }
                     else:
                         raise osv.except_osv(_('Warning !'), _('You might have done following mistakes. Please correct them and try again. \n 1. You have selected more than 3 years in any case. \n 2. You have not selected  Percentage option, but you have selected more than 2 years. \n You can select maximum 3 years. Please check again. \n 3. You have selected Percentage option with more than 2 years, but you have not selected landscape format. You have to select Landscape option. Please Check it.'))
@@ -119,7 +114,6 @@ class account_compare_account_balance_report(osv.osv_memory):
                             'type': 'ir.actions.report.xml',
                             'report_name': 'account.account.balance.landscape',
                             'datas': data,
-                            'nodestroy':True,
                             }
                 else:
                         raise osv.except_osv(_('Warning !'), _('You might have done following mistakes. Please correct them and try again. \n 1. You have selected more than 3 years in any case. \n 2. You have not selected  Percentage option, but you have selected more than 2 years. \n You can select maximum 3 years. Please check again. \n 3. You have selected Percentage option with more than 2 years, but you have not selected landscape format. You have to select Landscape option. Please Check it.'))
@@ -129,14 +123,12 @@ class account_compare_account_balance_report(osv.osv_memory):
                             'type': 'ir.actions.report.xml',
                             'report_name': 'account.account.balance.landscape',
                             'datas': data,
-                            'nodestroy':True,
                             }
                 else:
                     return {
                     'type': 'ir.actions.report.xml',
                     'report_name': 'account.balance.account.balance',
                     'datas': data,
-                    'nodestroy':True,
                     }
 account_compare_account_balance_report()
 
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index 403abbcbe12..4d0479f8014 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -58,6 +58,11 @@ cancelled, please check the box !'))
                     'WHERE fiscalyear_id = %s', ('done', fy_id))
             cr.execute('UPDATE account_fiscalyear ' \
                     'SET state = %s WHERE id = %s', ('done', fy_id))
+
+            # Log message for Fiscalyear
+            fy_pool = self.pool.get('account.fiscalyear')
+            fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code
+            fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code))
             return {}
 
 account_fiscalyear_close_state()
diff --git a/addons/account/wizard/account_general_journal.py b/addons/account/wizard/account_general_journal.py
index 8bd2913ae62..f22846f1637 100644
--- a/addons/account/wizard/account_general_journal.py
+++ b/addons/account/wizard/account_general_journal.py
@@ -52,7 +52,6 @@ class account_general_journal(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'account.general.journal',
             'datas': datas,
-            'nodestroy':True,
             }
 
 account_general_journal()
diff --git a/addons/account/wizard/account_general_journal_view.xml b/addons/account/wizard/account_general_journal_view.xml
index a3a54843396..711e3a85329 100644
--- a/addons/account/wizard/account_general_journal_view.xml
+++ b/addons/account/wizard/account_general_journal_view.xml
@@ -2,27 +2,27 @@
 <openerp>
     <data>
 
-		<record id="view_account_general_journal" model="ir.ui.view">
+        <record id="view_account_general_journal" model="ir.ui.view">
             <field name="name">Account Genral Journal</field>
             <field name="model">account.general.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Print General Journal">
-				<group height="380" width="400">
-				    <group>
-					    <separator string="Journals"/><newline/>
-					    <field name="journal_id" nolabel="1"/><newline/>
-					    <separator string="Periods"/><newline/>
-					    <field name="period_id" nolabel="1"/><newline/>
-					</group>
-					<newline/>
-				    <group>
-			    		<separator colspan="4"/>
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
-					</group>
-				</group>
-			</form>
+            <form string="Print General Journal">
+                <group height="380" width="400">
+                    <group>
+                        <separator string="Journals"/><newline/>
+                        <field name="journal_id" nolabel="1"/><newline/>
+                        <separator string="Periods"/><newline/>
+                        <field name="period_id" nolabel="1"/><newline/>
+                    </group>
+                    <newline/>
+                    <group>
+                        <separator colspan="4"/>
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+                    </group>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -35,12 +35,12 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem
-	        name="General Journals"
-	        parent="account.menu_generic_report"
-	        action="action_account_general_journal"
-	        id="menu_account_general_journal"
-	        icon="STOCK_PRINT"/>
+        <menuitem
+            name="General Journals"
+            parent="account.menu_journals_report"
+            action="action_account_general_journal"
+            id="menu_account_general_journal"
+            icon="STOCK_PRINT"/>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_general_ledger_report.py b/addons/account/wizard/account_general_ledger_report.py
index ad5e74786b0..f8c7794673b 100644
--- a/addons/account/wizard/account_general_ledger_report.py
+++ b/addons/account/wizard/account_general_ledger_report.py
@@ -107,14 +107,12 @@ class account_general_ledger_report(osv.osv_memory):
                         'type': 'ir.actions.report.xml',
                         'report_name': 'account.general.ledger_landscape',
                         'datas': data,
-                        'nodestroy':True,
                     }
                 else:
                     return {
                         'type': 'ir.actions.report.xml',
                         'report_name': 'account.general.ledger',
                         'datas': data,
-                        'nodestroy':True,
                     }
         else:
             raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
@@ -141,14 +139,12 @@ class account_general_ledger_report(osv.osv_memory):
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.general.ledger_landscape',
                 'datas': data,
-                'nodestroy':True,
             }
         else:
             return {
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.general.ledger',
                 'datas': data,
-                'nodestroy':True,
             }
 account_general_ledger_report()
 
diff --git a/addons/account/wizard/account_general_ledger_report_view.xml b/addons/account/wizard/account_general_ledger_report_view.xml
index b06c24d501d..67526d51788 100644
--- a/addons/account/wizard/account_general_ledger_report_view.xml
+++ b/addons/account/wizard/account_general_ledger_report_view.xml
@@ -96,7 +96,7 @@
         <menuitem
         	icon="STOCK_PRINT"
 	        name="General Ledger"
-	        parent="account.menu_generic_report"
+	        parent="account.final_accounting_reports"
 	        action="action_account_general_ledger_menu"
 	        id="menu_general_ledger"
 	       />
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index c1e4eb9b888..a48dd1a402e 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -2,31 +2,37 @@
 <openerp>
     <data>
 
-    	<record id="view_account_invoice_refund" model="ir.ui.view">
+        <record id="view_account_invoice_refund" model="ir.ui.view">
             <field name="name">account.invoice.refund.form</field>
             <field name="model">account.invoice.refund</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Credit Note">
-                	<separator string="This wizard is used to refund the invoice" colspan="4"/>
-                	<group colspan="4" >
-                    	 <label string="Are you sure you want to refund this invoice ?" colspan="2"/>
-                    	 <newline/>
-                    	 <field name="date"/>
-                    	 <field name="period"/>
-                    	 <field name="description"/>
+                    <separator string="This wizard is used to refund the invoice" colspan="4"/>
+                    <group colspan="4" >
+                         <label string="Are you sure you want to refund this invoice ?" colspan="2"/>
+                         <newline/>
+                         <field name="date"/>
+                         <field name="period"/>
+                         <field name="description"/>
                     </group>
-                       	<separator colspan="4"/>
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4" fill="1">
+                        <label align="0.0" width="300" string="Refund Invoice: creates a refund invoice"/>
+                        <label align="0.0" width="500" colspan="4" string="Cancel Invoice: creates a reverse accounting entries to cancel the invoice"/>
+                        <label align="0.0" width="550" colspan="4" string="Modify Invoice: creates a refund invoice, and new copy of the same invoice ready for editing"/>
+                    </group>
+                    <separator colspan="4"/>
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-redo" string="Refund Invoice" name="invoice_refund" type="object"/>
-                    	<button icon="gtk-ok" string="Cancel Invoice" name="invoice_cancel" type="object"/>
-                    	<button icon="gtk-undo" string="Modify Invoice" name="invoice_modify" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-redo" string="Refund Invoice" name="invoice_refund" type="object"/>
+                        <button icon="gtk-ok" string="Cancel Invoice" name="invoice_cancel" type="object"/>
+                        <button icon="gtk-undo" string="Modify Invoice" name="invoice_modify" type="object"/>
                    </group>
                </form>
             </field>
-    	</record>
+        </record>
 
         <record id="action_account_invoice_refund" model="ir.actions.act_window">
             <field name="name">Credit Note</field>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 8bdfb4ba8e2..7130e7dc758 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -25,15 +25,15 @@
            <field name="target">new</field>
         </record>
 
-        <record model="ir.values" id="action_account_invoice_confirm_values">
-            <field name="model_id" ref="account.model_account_invoice" />
-            <field name="object" eval="1" />
-            <field name="name">Confirm Draft Invoices</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_confirm'))" />
-            <field name="key">action</field>
-            <field name="model">account.invoice</field>
-        </record>
+<!--        <record model="ir.values" id="action_account_invoice_confirm_values">-->
+<!--            <field name="model_id" ref="account.model_account_invoice" />-->
+<!--            <field name="object" eval="1" />-->
+<!--            <field name="name">Confirm Draft Invoices</field>-->
+<!--            <field name="key2">client_action_multi</field>-->
+<!--            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_confirm'))" />-->
+<!--            <field name="key">action</field>-->
+<!--            <field name="model">account.invoice</field>-->
+<!--        </record>-->
 
         <record id="account_invoice_cancel_view" model="ir.ui.view">
             <field name="name">account.invoice.cancel.form</field>
@@ -44,7 +44,7 @@
                 <separator string="Cancel Selected Invoices" colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="terp-dialog-close" special="cancel" string="Close"/>
-                        <button icon="terp-gtk-stop" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
@@ -59,15 +59,15 @@
            <field name="target">new</field>
         </record>
 
-        <record model="ir.values" id="action_account_invoice_cancel_values">
-            <field name="model_id" ref="account.model_account_invoice" />
-            <field name="object" eval="1" />
-            <field name="name">Cancel Selected Invoices</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_cancel'))" />
-            <field name="key">action</field>
-            <field name="model">account.invoice</field>
-        </record>
+<!--        <record model="ir.values" id="action_account_invoice_cancel_values">-->
+<!--            <field name="model_id" ref="account.model_account_invoice" />-->
+<!--            <field name="object" eval="1" />-->
+<!--            <field name="name">Cancel Selected Invoices</field>-->
+<!--            <field name="key2">client_action_multi</field>-->
+<!--            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_cancel'))" />-->
+<!--            <field name="key">action</field>-->
+<!--            <field name="model">account.invoice</field>-->
+<!--        </record>-->
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_journal_select.py b/addons/account/wizard/account_journal_select.py
index f13958ed90f..e11660a42af 100644
--- a/addons/account/wizard/account_journal_select.py
+++ b/addons/account/wizard/account_journal_select.py
@@ -38,10 +38,11 @@ class account_journal_select(osv.osv_memory):
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id])[0]
         cr.execute('select journal_id, period_id from account_journal_period where id=%s', (context['active_id'],))
-        journal_id, period_id = cr.fetchone()
-
-        result['domain'] = str([('journal_id', '=', journal_id), ('period_id', '=', period_id)])
-        result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
+        res = cr.fetchone()
+        if res:
+            journal_id, period_id = res
+            result['domain'] = str([('journal_id', '=', journal_id), ('period_id', '=', period_id)])
+            result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
         return result
 
 
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index 4fc94ec0d6c..f5df24fa585 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -11,7 +11,7 @@
                         <label string="Are you sure you want to open Journal Entries?" colspan="4"/>
                            <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     	<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
                    </group>
                </form>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index f17c2396255..d41993733df 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -13,7 +13,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     	<button icon="terp-gtk-go-back-rtl" string="Open for bank reconciliation" name="action_open_window" type="object"/>
                    </group>
                 </form>
@@ -25,9 +25,10 @@
             <field name="res_model">account.move.bank.reconcile</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_move_bank_reconcile"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_move_bank_reconcile"/>
+            <field name="target">new</field>
+            <field name="help">Bank Reconciliation consists of verifying that your bank statement corresponds with the entries (or records) of that account in your accounting system.</field>
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index af9dd313255..d766153a9b4 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -16,7 +16,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     	<button icon="terp-gtk-go-back-rtl" string="Open Journal" name="action_open_window" type="object"/>
                    	</group>
                </form>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 4f88f618727..22bc289f816 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -13,7 +13,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel" />
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
 						<button icon="terp-gtk-go-back-rtl"
 							string="Open for Reconciliation" name="action_open_window"
 							type="object" />
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index bf3831baea0..645b5a098e3 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -7,12 +7,12 @@
             <field name="model">account.move.line.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Account Select">
-                		<label string="Are you sure you want to open Account move line entries!" colspan="4"/>
-                       	<separator string="" colspan="4" />
+                <form string="Account Select">
+                    <label string="Are you sure you want to open Account move line entries!" colspan="4"/>
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
-                    	<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
@@ -27,13 +27,13 @@
            <field name="target">new</field>
         </record>
 
-        <record id="ir_account_move_line_select" model="ir.values">
-            <field name="key2">tree_but_open</field>
-            <field name="model">account.account</field>
-            <field name="name">Open Account</field>
-            <field eval="'ir.actions.act_window,%d'%action_account_move_line_select_button" name="value"/>
-            <field eval="True" name="object"/>
-        </record>
+<!--        <record id="ir_account_move_line_select" model="ir.values">-->
+<!--            <field name="key2">tree_but_open</field>-->
+<!--            <field name="model">account.account</field>-->
+<!--            <field name="name">Open Account</field>-->
+<!--            <field eval="'ir.actions.act_window,%d'%action_account_move_line_select_button" name="value"/>-->
+<!--            <field eval="True" name="object"/>-->
+<!--        </record>-->
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index f2a3882db91..ae1b069a1dc 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -13,7 +13,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel" />
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
 						<button icon="terp-gtk-go-back-rtl"
 							string="Open For Unreconciliation" name="action_open_window"
 							type="object" />
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index afc7b7e6828..435f15388c1 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -13,7 +13,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     	<button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
                     </group>
                 </form>
diff --git a/addons/account/wizard/account_partner_balance_report.py b/addons/account/wizard/account_partner_balance_report.py
index c6d82128256..5d023d8f8ec 100644
--- a/addons/account/wizard/account_partner_balance_report.py
+++ b/addons/account/wizard/account_partner_balance_report.py
@@ -82,7 +82,6 @@ class account_partner_balance(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'account.partner.balance',
             'datas': data,
-            'nodestroy':True,
             }
 
     def _check_date(self, cr, uid, data, context):
@@ -98,7 +97,6 @@ class account_partner_balance(osv.osv_memory):
                     'type': 'ir.actions.report.xml',
                     'report_name': 'account.partner.balance',
                     'datas': data,
-                    'nodestroy':True,
                     }
         else:
             raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
diff --git a/addons/account/wizard/account_partner_balance_report_view.xml b/addons/account/wizard/account_partner_balance_report_view.xml
index f5a8043673f..abbddcd5074 100644
--- a/addons/account/wizard/account_partner_balance_report_view.xml
+++ b/addons/account/wizard/account_partner_balance_report_view.xml
@@ -33,7 +33,7 @@
      				<group colspan="4" col="6">
                        	<separator colspan="4"/>
                        	<newline/>
-     					<button special="cancel" string="Cancel" icon="terp-gtk-stop"/>
+     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                			<button name="check_state" string="Print" type="object" icon="gtk-print"/>
  					</group>
  					</group>
@@ -50,6 +50,7 @@
              <field name="view_id" ref="account_partner_balance_view"/>
              <field name="context">{'record_id':active_id}</field>
              <field name="target">new</field>
+             <field name="help">This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance.</field>
        </record>
 
  	   <menuitem icon="STOCK_PRINT"
@@ -59,4 +60,4 @@
  			parent="account.next_id_22"/>
 
      </data>
- </openerp>
\ No newline at end of file
+ </openerp>
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index f0f050e953c..56a4f2c5e35 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -46,6 +46,11 @@ class account_period_close(osv.osv_memory):
                 for id in context['active_ids']:
                     cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
+
+                    # Log message for Period
+                    period_pool = self.pool.get('account.period')
+                    for period_id, name in period_pool.name_get(cr, uid, [id]):
+                        period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
         return {}
 
 account_period_close()
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 82e7f8b3f3a..7d1b048546f 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -27,8 +27,8 @@
             <field name="res_model">account.period.close</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_period_close"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_period_close"/>
+            <field name="target">new</field>
         </record>
 
         <record id="action_idea_post_vote_values" model="ir.values">
@@ -42,4 +42,4 @@
 	    </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_pl_report.py b/addons/account/wizard/account_pl_report.py
index f507226fefd..87f5accf068 100644
--- a/addons/account/wizard/account_pl_report.py
+++ b/addons/account/wizard/account_pl_report.py
@@ -68,7 +68,7 @@ class account_pl_report(osv.osv_memory):
         'fiscalyear' : False,
         'display_account': 'bal_all',
         'display_type': True,
-        }
+    }
 
     def next_view(self, cr, uid, ids, context=None):
         obj_model = self.pool.get('ir.model.data')
@@ -111,14 +111,12 @@ class account_pl_report(osv.osv_memory):
                 'type': 'ir.actions.report.xml',
                 'report_name': 'pl.account.horizontal',
                 'datas': data,
-                'nodestroy':True,
                 }
         else:
             return {
                 'type': 'ir.actions.report.xml',
                 'report_name': 'pl.account',
                 'datas': data,
-                'nodestroy':True,
                 }
             
     def _check_date(self, cr, uid, data, context=None):
@@ -138,14 +136,12 @@ class account_pl_report(osv.osv_memory):
                         'type': 'ir.actions.report.xml',
                         'report_name': 'pl.account.horizontal',
                         'datas': data,
-                        'nodestroy':True,
                         }
                 else:
                     return {
                         'type': 'ir.actions.report.xml',
                         'report_name': 'pl.account',
                         'datas': data,
-                        'nodestroy':True,
                         }
         else:
             raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
diff --git a/addons/account/wizard/account_pl_report_view.xml b/addons/account/wizard/account_pl_report_view.xml
index b1104df8d25..219d41d312f 100644
--- a/addons/account/wizard/account_pl_report_view.xml
+++ b/addons/account/wizard/account_pl_report_view.xml
@@ -55,6 +55,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select Chart">
+                    <label string="Select account chart to print profit and loss account report" colspan="4"/>
+                    <separator colspan="4"/>
                     <field name="Account_list"/>
                     <separator colspan="4"/>
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -74,11 +76,6 @@
              <field name="target">new</field>
        </record>
        
-       <menuitem 
-            parent="account.menu_finance_legal_statement" 
-            id="final_accounting_reports"
-            name="Accounting Reports"/>
-
         <menuitem icon="STOCK_PRINT"
                 name="Profit And Loss"
                 action="action_pl_balance_account_report"
diff --git a/addons/account/wizard/account_print_journal.py b/addons/account/wizard/account_print_journal.py
index f40efe3eb99..53c73e66355 100644
--- a/addons/account/wizard/account_print_journal.py
+++ b/addons/account/wizard/account_print_journal.py
@@ -59,7 +59,6 @@ class account_print_journal(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'account.journal.period.print',
             'datas': datas,
-            'nodestroy':True,
             }
 
 account_print_journal()
diff --git a/addons/account/wizard/account_print_journal_view.xml b/addons/account/wizard/account_print_journal_view.xml
index 3c08fa5f697..31cbe322bd3 100644
--- a/addons/account/wizard/account_print_journal_view.xml
+++ b/addons/account/wizard/account_print_journal_view.xml
@@ -2,51 +2,51 @@
 <openerp>
     <data>
 <!---->
-<!--		<record id="view_account_print_journal" model="ir.ui.view">-->
+<!--        <record id="view_account_print_journal" model="ir.ui.view">-->
 <!--            <field name="name">Account Print Journal</field>-->
 <!--            <field name="model">account.print.journal</field>-->
 <!--            <field name="type">form</field>-->
 <!--            <field name="arch" type="xml">-->
-<!--			<form string="Print Journal">-->
-<!--			    <group col="4" colspan="6">-->
-<!--				    <field name="journal_id"/>-->
-<!--				    <field name="period_id"/>-->
-<!--				    <newline/>-->
-<!--				    <field name="sort_selection"/>-->
-<!--				</group>-->
-<!--				<separator colspan="4"/>-->
-<!--			    <group col="2" colspan="4">-->
-<!--	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>-->
-<!--						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>-->
-<!--				</group>-->
-<!--			</form>-->
+<!--            <form string="Print Journal">-->
+<!--                <group col="4" colspan="6">-->
+<!--                    <field name="journal_id"/>-->
+<!--                    <field name="period_id"/>-->
+<!--                    <newline/>-->
+<!--                    <field name="sort_selection"/>-->
+<!--                </group>-->
+<!--                <separator colspan="4"/>-->
+<!--                <group col="2" colspan="4">-->
+<!--                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>-->
+<!--                        <button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>-->
+<!--                </group>-->
+<!--            </form>-->
 <!--            </field>-->
 <!--        </record>-->
 
 
-		<record id="view_account_print_journal" model="ir.ui.view">
+        <record id="view_account_print_journal" model="ir.ui.view">
             <field name="name">Account Print Journal</field>
             <field name="model">account.print.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Print Journal">
-				<group height="400" width="400">
-			    <group>
-			    	<separator string="Journals"/><newline/>
-				    <field name="journal_id" nolabel="1"/><newline/>
-				    <separator string="Periods"/><newline/>
-				    <field name="period_id" nolabel="1"/><newline/>
-				</group>
-				<newline/>
-				<group>
-				    <field name="sort_selection"/>
-				    <newline/>
-					<separator colspan="4"/>
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
-				</group>
-				</group>
-			</form>
+            <form string="Print Journal">
+                <group height="430" width="420">
+                    <group>
+                        <separator string="Journals"/><newline/>
+                        <field name="journal_id" nolabel="1"/><newline/>
+                        <separator string="Periods"/><newline/>
+                        <field name="period_id" nolabel="1"/><newline/>
+                    </group>
+                    <newline/>
+                    <group>
+                        <field name="sort_selection"/>
+                        <newline/>
+                        <separator colspan="4"/>
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+                    </group>
+                </group>
+            </form>
             </field>
         </record>
         
@@ -59,12 +59,12 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem
-	        name="Journals"
-	        parent="account.menu_generic_report"
-	        action="action_account_print_journal"
-	        id="menu_account_print_journal"
-	        icon="STOCK_PRINT"/>
+        <menuitem
+            name="Journals"
+            parent="account.menu_journals_report"
+            action="action_account_print_journal"
+            id="menu_account_print_journal"
+            icon="STOCK_PRINT"/>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 5ce124bfcc7..4d8283ab0c1 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -2,30 +2,30 @@
 <openerp>
     <data>
 
-<!--		<record id="view_account_move_line_reconcile_prompt" model="ir.ui.view">-->
+<!--        <record id="view_account_move_line_reconcile_prompt" model="ir.ui.view">-->
 <!--            <field name="name">account.move.line.reconcile.prompt.form</field>-->
 <!--            <field name="model">account.move.line.reconcile.prompt</field>-->
 <!--            <field name="type">form</field>-->
 <!--            <field name="arch" type="xml">-->
 <!--                <form string="Reconciliation">-->
-<!--                	<separator string="Are you sure you want to reconcile entries?" colspan="4"/>-->
-<!--				    <group colspan="4" col="6">-->
-<!--                       	<label string ="" colspan="2"/>-->
+<!--                    <separator string="Are you sure you want to reconcile entries?" colspan="4"/>-->
+<!--                    <group colspan="4" col="6">-->
+<!--                           <label string ="" colspan="2"/>-->
 <!---->
-<!--                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
-<!--                    	<button icon="gtk-ok" string="Ok" name="ask_reconcilation" type="object" default_focus="1"/>-->
+<!--                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
+<!--                        <button icon="gtk-ok" string="Ok" name="ask_reconcilation" type="object" default_focus="1"/>-->
 <!--                   </group>-->
 <!--               </form>-->
 <!--            </field>-->
 <!--        </record>-->
 
-<!--		<record id="action_view_account_move_line_reconcile_prompt" model="ir.actions.act_window">-->
-<!--        	<field name="name">Reconcile Entries</field>-->
+<!--        <record id="action_view_account_move_line_reconcile_prompt" model="ir.actions.act_window">-->
+<!--            <field name="name">Reconcile Entries</field>-->
 <!--            <field name="res_model">account.move.line.reconcile.prompt</field>-->
 <!--            <field name="view_type">form</field>-->
 <!--            <field name="view_mode">tree,form</field>-->
-<!--           	<field name="view_id" ref="view_account_move_line_reconcile_prompt"/>-->
-<!--           	<field name="target">new</field>-->
+<!--               <field name="view_id" ref="view_account_move_line_reconcile_prompt"/>-->
+<!--               <field name="target">new</field>-->
 <!--        </record>-->
 
 <!--        <record model="ir.values" id="action_account_move_line_reconcile_prompt_values">-->
@@ -36,41 +36,41 @@
 <!--            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile_prompt'))" />-->
 <!--            <field name="key">action</field>-->
 <!--            <field name="model">account.move.line</field>-->
-<!--		</record>-->
-		
-		<record id="view_account_move_line_reconcile_full" model="ir.ui.view">
+<!--        </record>-->
+        
+        <record id="view_account_move_line_reconcile_full" model="ir.ui.view">
             <field name="name">account.move.line.reconcile.full.form</field>
             <field name="model">account.move.line.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation">
-                	<group height="210" width="550">
-	                	<separator string="Reconciliation transactions" colspan="4"/>
-					    <field name="trans_nbr"/>
-					    <newline/>
-					    <field name="credit"/>
-					    <field name="debit"/>
-					    <separator string="Write-Off" colspan="4"/>
-					    <field name="writeoff"/>
-					    <group colspan="4" col="6">
-	                       	<label string ="" colspan="2"/>
-	                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-	                    	<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
-	                    	<button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
-	                    	<button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
-	                   </group>
-	                </group>
+                    <group height="210" width="550">
+                        <separator string="Reconciliation transactions" colspan="4"/>
+                        <field name="trans_nbr"/>
+                        <newline/>
+                        <field name="credit"/>
+                        <field name="debit"/>
+                        <separator string="Write-Off" colspan="4"/>
+                        <field name="writeoff"/>
+                        <group colspan="4" col="6">
+                            <label string ="" colspan="2"/>
+                            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                            <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
+                            <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
+                            <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
+                       </group>
+                    </group>
                </form>
             </field>
         </record>
-		
-		<record id="action_view_account_move_line_reconcile" model="ir.actions.act_window">
-        	<field name="name">Reconcile Entries</field>
+        
+        <record id="action_view_account_move_line_reconcile" model="ir.actions.act_window">
+            <field name="name">Reconcile Entries</field>
             <field name="res_model">account.move.line.reconcile</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_move_line_reconcile_full"/>
-           	<field name="target">new</field>
+            <field name="view_id" ref="view_account_move_line_reconcile_full"/>
+            <field name="target">new</field>
         </record>
         
         <record model="ir.values" id="action_account_move_line_reconcile_prompt_values">
@@ -81,72 +81,72 @@
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile'))" />
             <field name="key">action</field>
             <field name="model">account.move.line</field>
-		</record>
-<!--    	<record id="view_account_move_line_reconcile_full" model="ir.ui.view">-->
+        </record>
+<!--        <record id="view_account_move_line_reconcile_full" model="ir.ui.view">-->
 <!--            <field name="name">account.move.line.reconcile.full.form</field>-->
 <!--            <field name="model">account.move.line.reconcile</field>-->
 <!--            <field name="type">form</field>-->
 <!--            <field name="arch" type="xml">-->
 <!--                <form string="Reconciliation">-->
-<!--                	<separator string="Reconciliation transactions" colspan="4"/>-->
-<!--				    <field name="trans_nbr"/>-->
-<!--				    <newline/>-->
-<!--				    <field name="credit"/>-->
-<!--				    <field name="debit"/>-->
-<!--				    <separator string="Write-Off" colspan="4"/>-->
-<!--				    <field name="writeoff"/>-->
-<!--				    <group colspan="4" col="6">-->
-<!--                       	<label string ="" colspan="2"/>-->
-<!--                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
-<!--                    	<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>-->
+<!--                    <separator string="Reconciliation transactions" colspan="4"/>-->
+<!--                    <field name="trans_nbr"/>-->
+<!--                    <newline/>-->
+<!--                    <field name="credit"/>-->
+<!--                    <field name="debit"/>-->
+<!--                    <separator string="Write-Off" colspan="4"/>-->
+<!--                    <field name="writeoff"/>-->
+<!--                    <group colspan="4" col="6">-->
+<!--                           <label string ="" colspan="2"/>-->
+<!--                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
+<!--                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>-->
 <!--                   </group>-->
 <!--               </form>-->
 <!--            </field>-->
 <!--        </record>-->
 <!---->
-<!--		<record id="view_account_move_line_reconcile_partial" model="ir.ui.view">-->
+<!--        <record id="view_account_move_line_reconcile_partial" model="ir.ui.view">-->
 <!--            <field name="name">account.move.line.reconcile.partial.form</field>-->
 <!--            <field name="model">account.move.line.reconcile</field>-->
 <!--            <field name="type">form</field>-->
 <!--            <field name="arch" type="xml">-->
 <!--                <form string="Reconciliation">-->
-<!--                	<separator string="Reconciliation transactions" colspan="4"/>-->
-<!--				    <field name="trans_nbr"/>-->
-<!--				    <newline/>-->
-<!--				    <field name="credit"/>-->
-<!--				    <field name="debit"/>-->
-<!--				    <separator string="Write-Off" colspan="4"/>-->
-<!--				    <field name="writeoff"/>-->
-<!--				    <group colspan="4" col="6">-->
-<!--                       	<label string ="" colspan="2"/>-->
-<!--                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
-<!--                    	<button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" default_focus="1"/>-->
-<!--                    	<button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object"/>-->
+<!--                    <separator string="Reconciliation transactions" colspan="4"/>-->
+<!--                    <field name="trans_nbr"/>-->
+<!--                    <newline/>-->
+<!--                    <field name="credit"/>-->
+<!--                    <field name="debit"/>-->
+<!--                    <separator string="Write-Off" colspan="4"/>-->
+<!--                    <field name="writeoff"/>-->
+<!--                    <group colspan="4" col="6">-->
+<!--                           <label string ="" colspan="2"/>-->
+<!--                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
+<!--                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" default_focus="1"/>-->
+<!--                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object"/>-->
 <!--                   </group>-->
 <!--               </form>-->
 <!--            </field>-->
 <!--        </record>-->
 
-		<record id="account_move_line_reconcile_writeoff" model="ir.ui.view">
+        <record id="account_move_line_reconcile_writeoff" model="ir.ui.view">
             <field name="name">account.move.line.reconcile.writeoff.form</field>
             <field name="model">account.move.line.reconcile.writeoff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Information addendum">
-                	<separator string="Write-Off Move" colspan="4"/>
-				    <field name="journal_id"/>
-				    <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
-				    <field name="date_p"/>
-				    <field name="comment"/>
-				    <separator string="Analytic" colspan="4"/>
-				    <field name="analytic_id"/>
-				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
+                    <separator string="Write-Off Move" colspan="4"/>
+                    <field name="journal_id"/>
+                    <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
+                    <field name="date_p"/>
+                    <field name="comment"/>
+                    <separator string="Analytic" colspan="4"/>
+                    <field name="analytic_id"/>
+                    <group colspan="4" col="6">
+                           <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
         </record>
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account/wizard/account_statement_from_invoice.py b/addons/account/wizard/account_statement_from_invoice.py
index c216fc88a6a..0523b5f60ca 100644
--- a/addons/account/wizard/account_statement_from_invoice.py
+++ b/addons/account/wizard/account_statement_from_invoice.py
@@ -34,21 +34,23 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                 }
 
     def populate_statement(self, cr, uid, ids, context=None):
-
+        
+        statement_id = context.get('statement_id', False)
+        if not statement_id:
+            return {}
+        data =  self.read(cr, uid, ids, context=context)[0]
+        line_ids = data['line_ids']
+        if not line_ids:
+            return {}
+        
         line_obj = self.pool.get('account.move.line')
         statement_obj = self.pool.get('account.bank.statement')
         statement_line_obj = self.pool.get('account.bank.statement.line')
         currency_obj = self.pool.get('res.currency')
         statement_reconcile_obj = self.pool.get('account.bank.statement.reconcile')
-
-        data =  self.read(cr, uid, ids, context=context)[0]
-        line_ids = data['line_ids']
         line_date = time.strftime('%Y-%m-%d')
-
-        if not line_ids:
-            return {}
-        statement_id = 'statement_id' in context and context['statement_id']
         statement = statement_obj.browse(cr, uid, statement_id, context=context)
+        
         # for each selected move lines
         for line in line_obj.browse(cr, uid, line_ids, context=context):
             ctx = context.copy()
diff --git a/addons/account/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml
index 05b77a1d570..b1c0e68534e 100644
--- a/addons/account/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account/wizard/account_statement_from_invoice_view.xml
@@ -54,6 +54,7 @@
             <field name="view_mode">tree,form</field>
            	<field name="view_id" ref="view_account_statement_from_invoice_lines"/>
            	<field name="target">new</field>
+           	<field name="context">{'statement_id': active_id}</field>
         </record>
 
 
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index aeb6aef8324..b272230e89b 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -2,34 +2,34 @@
 <openerp>
     <data>
 
-          <record id="view_account_subscription_generate" model="ir.ui.view">
+        <record id="view_account_subscription_generate" model="ir.ui.view">
             <field name="name">account.subscription.generate.form</field>
             <field name="model">account.subscription.generate</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute">
                     <group colspan="4" >
-                         <separator string="Generate entries before:" colspan="4"/>
-                           <field name="date"/>
+                        <separator string="Generate entries before:" colspan="4"/>
+                        <field name="date"/>
                     </group>
-                           <separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                           <label string ="" colspan="2"/>
+                        <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel" />
                         <button icon="gtk-execute" string="Compute Entry Dates"
-                            name="action_generate" type="object" />
+                        name="action_generate" type="object" />
                     </group>
                </form>
             </field>
-          </record>
+        </record>
 
         <record id="action_account_subscription_generate" model="ir.actions.act_window">
-            <field name="name">Automatic Recurring</field>
+            <field name="name">Generate Entries</field>
             <field name="res_model">account.subscription.generate</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-               <field name="view_id" ref="view_account_subscription_generate"/>
-               <field name="target">new</field>
+            <field name="view_id" ref="view_account_subscription_generate"/>
+            <field name="target">new</field>
         </record>
 
         <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_recurrent_entries" />
diff --git a/addons/account/wizard/account_third_party_ledger.py b/addons/account/wizard/account_third_party_ledger.py
index daff801f3bd..fa40cd0bdc6 100644
--- a/addons/account/wizard/account_third_party_ledger.py
+++ b/addons/account/wizard/account_third_party_ledger.py
@@ -97,14 +97,12 @@ class account_partner_ledger(osv.osv_memory):
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.third_party_ledger',
                 'datas': data,
-                'nodestroy':True,
             }
         else:
             return {
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.third_party_ledger_other',
                 'datas': data,
-                'nodestroy':True,
             }
 
     def _check_date(self, cr, uid, data, context=None):
@@ -122,7 +120,6 @@ class account_partner_ledger(osv.osv_memory):
                     'type': 'ir.actions.report.xml',
                     'report_name': 'account.third_party_ledger',
                     'datas': data,
-                    'nodestroy':True,
                 }
         else:
             raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
diff --git a/addons/account/wizard/account_third_party_ledger.xml b/addons/account/wizard/account_third_party_ledger.xml
index 9cb0463ea48..93af8cc6545 100644
--- a/addons/account/wizard/account_third_party_ledger.xml
+++ b/addons/account/wizard/account_third_party_ledger.xml
@@ -53,6 +53,7 @@
              <field name="view_id" ref="account_partner_ledger_view"/>
              <field name="context">{'record_id':active_id}</field>
              <field name="target">new</field>
+             <field name="help">To get detailed information about a partner you can ask for the Partner Ledgers.</field>
        </record>
 
  	   <menuitem icon="STOCK_PRINT"
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 03ca451e509..f4cd436c9a2 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -10,7 +10,8 @@
             <form string="Create Entries From Models">
                 <group height="240" width="510">
                     <separator string="This wizard will create recurring accounting entries" colspan="4"/>
-                    <field name="model"/>
+                    <label string="Select recurring to create a manualy recurring accounting entries" width="400"/>
+                    <field name="model" colspan="4" nolabel="1"/>
                     <separator colspan="4"/>
                     <group colspan="4" col="2">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -41,8 +42,8 @@
             <field name="model">account.move.line</field>
         </record>
 
-        <menuitem action="action_view_account_use_model"
-                    parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>
+<!--        <menuitem action="action_view_account_use_model"-->
+<!--                    parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>-->
 
         <record id="view_account_use_model_open_entry" model="ir.ui.view">
             <field name="name">account.use.model.open.entry.form</field>
@@ -50,7 +51,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model">
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="6" width="300" height="70">
                            <label string = "Entry Lines Created." colspan="2"/>
                            <newline/>
                         <button icon="gtk-ok" special="cancel" string="Ok"/>
@@ -66,10 +67,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model">
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="6" width="300" height="70">
                            <label string = "Are you sure you want to create entries?" colspan="2"/>
                            <newline/>
-                        <button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
                    </group>
                </form>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 232a924dbd9..094304d25af 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -16,7 +16,7 @@
                 <field name="period_id"/>
                 <group colspan="4" col="6">
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="terp-camera_test" string="Validate" name="validate_move" type="object"/>
+                    <button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
                </group>
                </form>
             </field>
@@ -27,8 +27,9 @@
             <field name="res_model">validate.account.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-           <field name="view_id" ref="validate_account_move_view"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="validate_account_move_view"/>
+            <field name="target">new</field>
+            <field name="help">The process of ledger is the process of transferring debit and credit amounts from a journal of original entry to a ledger book.</field>
         </record>
 
         <menuitem
@@ -47,7 +48,7 @@
               <form string="Validate Moves">
               <separator string="Validate Ledger Postings" colspan="4"/>
                   <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="validate_move_lines" string="Validate" type="object" icon="gtk-go-forward" default_focus="1"/>
+                <button name="validate_move_lines" string="Approve" type="object" icon="gtk-go-forward" default_focus="1"/>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 15c5a55203a..80f4f8360a1 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -22,43 +22,42 @@
 from osv import osv, fields
 
 class account_vat_declaration(osv.osv_memory):
-	_name = 'account.vat.declaration'
-	_description = 'Account Vat Declaration'
+    _name = 'account.vat.declaration'
+    _description = 'Account Vat Declaration'
 
-	_columns = {
+    _columns = {
         'based_on': fields.selection([('invoices','Invoices'),
-									 ('payments','Payments'),],
-									  'Based On', required=True),
+                                     ('payments','Payments'),],
+                                      'Based On', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-		'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
-		}
+        'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
+        }
 
-	def _get_company(self, cr, uid, context={}):
-		user_obj = self.pool.get('res.users')
-		company_obj = self.pool.get('res.company')
-		user = user_obj.browse(cr, uid, uid, context=context)
-		if user.company_id:
-			return user.company_id.id
-		else:
-			return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+    def _get_company(self, cr, uid, context={}):
+        user_obj = self.pool.get('res.users')
+        company_obj = self.pool.get('res.company')
+        user = user_obj.browse(cr, uid, uid, context=context)
+        if user.company_id:
+            return user.company_id.id
+        else:
+            return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
 
-	_defaults = {
-	        'based_on': 'invoices',
-	        'company_id': _get_company
-	    }
+    _defaults = {
+            'based_on': 'invoices',
+            'company_id': _get_company
+        }
 
-	def create_vat(self, cr, uid, ids, context={}):
-		if context is None:
-			context = {}
-		datas = {'ids': context.get('active_ids', [])}
-  		datas['model'] = 'account.tax.code'
-		datas['form'] = self.read(cr, uid, ids)[0]
-		return {
-			'type': 'ir.actions.report.xml',
-			'report_name': 'account.vat.declaration',
-			'datas': datas,
-            'nodestroy':True,
-			}
+    def create_vat(self, cr, uid, ids, context={}):
+        if context is None:
+            context = {}
+        datas = {'ids': context.get('active_ids', [])}
+        datas['model'] = 'account.tax.code'
+        datas['form'] = self.read(cr, uid, ids)[0]
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'account.vat.declaration',
+            'datas': datas,
+            }
 
 account_vat_declaration()
 
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 8978dc50ee3..e258132912f 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -33,6 +33,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+            <field name="help">This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by Open ERP from invoices (or payments, in some countries). This data is updated in real time. That’s very 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.</field>
         </record>
 
 		<menuitem
diff --git a/addons/account_analytic_analysis/i18n/bs.po b/addons/account_analytic_analysis/i18n/bs.po
index befb349e7a0..00719ef3f2e 100644
--- a/addons/account_analytic_analysis/i18n/bs.po
+++ b/addons/account_analytic_analysis/i18n/bs.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-12 13:13+0000\n"
-"Last-Translator: Tarik_985 <Unknown>\n"
+"PO-Revision-Date: 2010-08-01 11:50+0000\n"
+"Last-Translator: Bojan Markovic <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-06-22 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -200,6 +200,9 @@ msgid ""
 "important data for project manager of services companies.\n"
 "Add menu to show relevant information for each manager."
 msgstr ""
+"Izmijeni analitički pregled konta da prikazuje\n"
+"bitne podatke za projekt menadžere uslužnih poduzeća.\n"
+"Dodaj meni za prikazivanje relevantnih informacija za svakog menadžera."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/nl_BE.po b/addons/account_analytic_analysis/i18n/nl_BE.po
index c9629549de8..59757b08e2f 100644
--- a/addons/account_analytic_analysis/i18n/nl_BE.po
+++ b/addons/account_analytic_analysis/i18n/nl_BE.po
@@ -1,23 +1,27 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_analytic_analysis
+# Dutch (Belgium) 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: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:34:14+0000\n"
-"PO-Revision-Date: 2009-08-28 15:34:14+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"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"
+"PO-Revision-Date: 2010-07-20 12:11+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: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
-msgid "Number of hours that can be invoiced plus those that already have been invoiced."
+msgid ""
+"Number of hours that can be invoiced plus those that already have been "
+"invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -41,6 +45,7 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr ""
 
 #. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
 msgid "All Analytic Accounts"
 msgstr ""
@@ -78,8 +83,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: 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 !"
+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_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
@@ -110,7 +117,9 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
-msgid "If invoice from the costs, this is the date of the latest work or cost that have been invoiced."
+msgid ""
+"If invoice from the costs, this is the date of the latest work or cost that "
+"have been invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -130,7 +139,9 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
-msgid "Number of hours you spent on the analytic account (from timesheet). It computes on all journal of type 'general'."
+msgid ""
+"Number of hours you spent on the analytic account (from timesheet). It "
+"computes on all journal of type 'general'."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -140,7 +151,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
-msgid "Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist."
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -174,7 +188,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
-msgid "Modify account analytic view to show\n"
+msgid ""
+"Modify account analytic view to show\n"
 "important data for project manager of services companies.\n"
 "Add menu to show relevant information for each manager."
 msgstr ""
@@ -252,7 +267,9 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid "Number of hours (from journal of type 'general') that can be invoiced if you invoice based on analytic account."
+msgid ""
+"Number of hours (from journal of type 'general') that can be invoiced if you "
+"invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -267,7 +284,9 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
-msgid "If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs."
+msgid ""
+"If invoice from analytic account, the remaining amount you can invoice to "
+"the customer based on the total costs."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -312,6 +331,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
-msgid "Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets."
+msgid ""
+"Total of costs for this account. It includes real costs (from invoices) and "
+"indirect costs, like time spent on timesheets."
 msgstr ""
-
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index 3e5027f0b32..f792d2780f9 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-13 03:49+0000\n"
+"PO-Revision-Date: 2010-07-13 04: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-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -21,7 +21,7 @@ msgstr ""
 msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
-msgstr ""
+msgstr "小时数能加在已开的发票上"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -31,7 +31,7 @@ msgstr "用户的小时数合计"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr ""
+msgstr "最近开票日期"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -270,12 +270,12 @@ msgstr "计算公式为:(实际利润/总成本×100)"
 msgid ""
 "Number of hours (from journal of type 'general') that can be invoiced if you "
 "invoice based on analytic account."
-msgstr "如果你的发票基于这辅助核算项目"
+msgstr "如果你的发票基于这辅助核算项, 小时数(从记录集合类型是\"普通\")可以开发票"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic accounts"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -287,7 +287,7 @@ msgstr "剩余的收入"
 msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
-msgstr "如果是辅助核算项目的发票,剩余金额你能给客户开基于总成本的发票"
+msgstr "如果是辅助核算项的发票, 剩余金额你能给客户开基于总成本的发票"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
@@ -315,23 +315,23 @@ msgstr "月"
 #: field:account_analytic_analysis.summary.month,account_id:0
 #: field:account_analytic_analysis.summary.user,account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
 msgid "Overpassed Accounts"
-msgstr "已废弃项目"
+msgstr "已废弃项"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "All Uninvoiced Entries"
-msgstr "所有未开发票凭证"
+msgstr "所有未开发票"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
-msgstr "这科目的成本合计,它包括实际成本(发票)和间接成本,如花费的时间表"
+msgstr "这项的成本合计,它包括实际成本(发票)和间接成本,如花费的时间表"
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index 3f735ebaa6c..b529a92e6f1 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@ Allows to automatically select analytic accounts based on criterions:
 * Company
 * Date
     """,
-    'author'    : 'Tiny',
+    'author'    : 'OpenERP SA',
     'website'   : 'http://www.openerp.com',
     'depends'   : ['sale'],
     'init_xml'  : [],
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index 63875579b24..43a13f183e1 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-29 00:37+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-07-13 04: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-06-22 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,7 +21,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
 msgid "Analytic Defaults"
-msgstr "默认辅助核算科目"
+msgstr "默认辅助核算项"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -31,13 +31,13 @@ msgstr "默认科目辅助核算"
 #. module: account_analytic_default
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件"
+msgstr "无效XML视图结构!"
 
 #. module: account_analytic_default
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "这对象名必须以x_开头并且不能包含特殊的字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -67,7 +67,7 @@ msgstr "产品"
 #. module: account_analytic_default
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr "辅助核算科目"
+msgstr "辅助核算项"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
@@ -82,12 +82,12 @@ msgstr "用户"
 #. module: account_analytic_default
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "动作定义里模块名无效"
+msgstr "在动作定义使用了无效的模块名。"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
 msgid "Entries"
-msgstr "条目"
+msgstr "记录"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,partner_id:0
@@ -102,7 +102,7 @@ msgstr "开始日期"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Conditions"
-msgstr "情况"
+msgstr "条件"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 28fd154b039..0c3d1d07370 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -54,7 +54,7 @@ for one account entry.
 The analytic plan validates the minimum and maximum percentage at the time of creation
 of distribution models.
         """,
-    'author'    : 'Tiny',
+    'author'    : 'OpenERP SA',
     'website'   : 'http://www.openerp.com',
     'depends'   : ['account', 'account_analytic_default'],
     'init_xml'  : [],
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index d5085b009da..22389386bba 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -192,8 +192,8 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-	<menuitem
-        parent="account.menu_analytic"
+    <menuitem
+        parent="account.menu_analytic_accounting"
         name="Multi Plans"
         id="menu_account_analytic_multi_plan_action"
         />
diff --git a/addons/account_analytic_plans/i18n/pt_BR.po b/addons/account_analytic_plans/i18n/pt_BR.po
index fecf2b8cc78..d5e41bbabb0 100644
--- a/addons/account_analytic_plans/i18n/pt_BR.po
+++ b/addons/account_analytic_plans/i18n/pt_BR.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2010-03-12 23:52+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2010-07-27 20:25+0000\n"
+"Last-Translator: Leandro Chaves <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-06-22 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-07-28 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -136,7 +136,7 @@ msgstr "Selecione Informação"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
 msgid "Account3 Id"
-msgstr ""
+msgstr "ID Conta3"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
@@ -157,27 +157,27 @@ msgstr "Ref. Conta Analítica"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "Conta Analítica:"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 msgid "Analytic Plan Line"
-msgstr ""
+msgstr "Linha do Plano Analítico"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
-msgstr ""
+msgstr "Conta Analítica Referencia"
 
 #. module: account_analytic_plans
 #: model:ir.actions.wizard,name:account_analytic_plans.create_model
 msgid "Create Model"
-msgstr ""
+msgstr "Criar Modelo"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
-msgstr ""
+msgstr "Lançamentos padrões"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -185,32 +185,32 @@ msgstr ""
 #: field:account.journal,plan_id:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 msgid "Analytic Plans"
-msgstr ""
+msgstr "Planos Analíticos"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
 msgid "Minimum Allowed (%)"
-msgstr ""
+msgstr "Mínimo Permitido (%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
 msgid "Account1 Id"
-msgstr ""
+msgstr "Id Conta1"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
 msgid "Maximum Allowed (%)"
-msgstr ""
+msgstr "Máximo Permitido (%)"
 
 #. module: account_analytic_plans
 #: wizard_view:create.model,info:0
 msgid "Distribution Model Saved"
-msgstr ""
+msgstr "Modelo de Distribuição Arquivado (Salvo)"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
-msgstr ""
+msgstr "Instância do Plano Analítico"
 
 #. module: account_analytic_plans
 #: constraint:ir.ui.view:0
@@ -220,7 +220,7 @@ msgstr "Invalido XML para Arquitetura da View"
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
-msgstr ""
+msgstr "Modelos de Distribuição"
 
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
@@ -256,17 +256,47 @@ msgid ""
 "for one account entry.\n"
 "        "
 msgstr ""
+"Este modelo permite o uso de vários planos analíticos, de acordo com o "
+"diário geral,\n"
+"de forma que várias linhas analíticas são criadas quando a fatura ou "
+"lançamento\n"
+"são confirmadas.\n"
+"\n"
+"Por exemplo, você pode definir a seguinte estrutura analítica:\n"
+"  Projetos\n"
+"      Projeto 1\n"
+"        SubProj 1.1\n"
+"        SubProj 1.2\n"
+"      Projeto 2\n"
+"  Vendedor\n"
+"      Erico\n"
+"      Fabiano\n"
+"\n"
+"No exemplo temos dois planos: Projetos e Vendedores. Uma fatura deve\n"
+"ser capaz de escrever lançamentos analíticos nos 2 planos: SubProj 1.1 e\n"
+"Fabiano. A conta também pode ser separada. O exemplo a seguir é para\n"
+"uma fatura que envolve os 2 subprojetos e está associada a um vendedor:\n"
+"\n"
+"Plano1:\n"
+"    SubProjeto 1.1: 50%\n"
+"    SubProjeto 1.2: 50%\n"
+"Plano2:\n"
+"    Eric: 100%\n"
+"\n"
+"Quando esta linha da fatura for confirmada, ela vai gerar 3 linhas\n"
+"analíticas, para um lançamento na conta,\n"
+"        "
 
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
 msgid "Multiple-plans management in Analytic Accounting"
-msgstr ""
+msgstr "Múltiplos-planos gerenciados na Contabilidade Analítica"
 
 #. 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 Lines"
-msgstr ""
+msgstr "Linhas do Plano Analítico"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -276,68 +306,69 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
 msgid "Model's Plan"
-msgstr ""
+msgstr "Plano do Modelo"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr ""
+msgstr "Id Conta2"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
-msgstr ""
+msgstr "Valor"
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
 msgid "Root account of this plan."
-msgstr ""
+msgstr "Conta raiz para este plano."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr ""
+msgstr "Id Conta6"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantidade"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr ""
+msgstr "Id Conta"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: account_analytic_plans
 #: wizard_button:create.model,info,end:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "Conta Raiz"
 
 #. module: account_analytic_plans
 #: wizard_view:create.model,info:0
 msgid ""
 "This distribution model has been saved. You will be able to reuse it later."
 msgstr ""
+"Este modelo de distribuição foi salvo. Você poderá reutilizá-lo mais tarde."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sequência"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta analítica"
 
 #. module: account_analytic_plans
 #: field:account.analytic.default,analytics_id:0
@@ -346,29 +377,29 @@ msgstr ""
 #: field:account.invoice.line,analytics_id:0
 #: field:account.move.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Distribuição Analítica"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
 msgid "Analytic Distribution's models"
-msgstr ""
+msgstr "Modelos de Distribuição Analítica"
 
 #. module: account_analytic_plans
 #: wizard_button:wizard.crossovered.analytic,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,date1:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data de Início"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "at"
-msgstr ""
+msgstr "em"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr ""
+msgstr "Data Inicial"
diff --git a/addons/account_analytic_plans/i18n/vi.po b/addons/account_analytic_plans/i18n/vi.po
index 00ac619ca64..43dffe4508a 100644
--- a/addons/account_analytic_plans/i18n/vi.po
+++ b/addons/account_analytic_plans/i18n/vi.po
@@ -1,20 +1,21 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_analytic_plans
+# 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.
 #
 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:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"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"
+"PO-Revision-Date: 2010-07-20 03:43+0000\n"
+"Last-Translator: Business Link Development Technologies <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: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
@@ -23,8 +24,9 @@ msgstr ""
 
 #. module: account_analytic_plans
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+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 chữ x_ và không chứa ký tự đặc biệt"
 
 #. module: account_analytic_plans
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
@@ -222,374 +224,9 @@ msgstr ""
 
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
-msgid "This module allows to use several analytic plans, according to the general journal,\n"
-"so that multiple analytic lines are created when the invoice or the entries\n"
-"are confirmed.\n"
-"\n"
-"For example, you can define the following analytic structure:\n"
-"  Projects\n"
-"      Project 1\n"
-"          SubProj 1.1\n"
-"          SubProj 1.2\n"
-"      Project 2\n"
-"  Salesman\n"
-"      Eric\n"
-"      Fabien\n"
-"\n"
-"Here, we have two plans: Projects and Salesman. An invoice line must\n"
-"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
-"Fabien. The amount can also be split. The following example is for\n"
-"an invoice that touches the two subproject and assigned to one salesman:\n"
-"\n"
-"Plan1:\n"
-"    SubProject 1.1 : 50%\n"
-"    SubProject 1.2 : 50%\n"
-"Plan2:\n"
-"    Eric: 100%\n"
-"\n"
-"So when this line of invoice will be confirmed, it will generate 3 analytic lines,\n"
-"for one account entry.\n"
-"        "
-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
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
-msgid "Analytic Plan Lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Crossovered Analytic -"
-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
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Amount"
-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
-#: field:account.analytic.plan.instance,account6_ids:0
-msgid "Account6 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Quantity"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account_ids:0
-msgid "Account Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Code"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_button:create.model,info,end:0
-msgid "OK"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,root_analytic_id:0
-msgid "Root Account"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_view:create.model,info: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.line,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,analytic_account_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.default,analytics_id:0
-#: view:account.analytic.plan.instance:0
-#: field:account.analytic.plan.instance,name:0
-#: field:account.invoice.line,analytics_id:0
-#: field:account.move.line,analytics_id:0
-msgid "Analytic Distribution"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
-msgid "Analytic Distribution's models"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_button:wizard.crossovered.analytic,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,date1:0
-msgid "Start Date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "at"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "From Date"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* account_analytic_plans
-#
 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:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00: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: \n"
-"Plural-Forms: \n"
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account4_ids:0
-msgid "Account4 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
-#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
-msgid "Crossovered Analytic"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account5_ids:0
-msgid "Account5 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,date2:0
-msgid "End Date"
-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
-#: field:account.analytic.plan.line,plan_id:0
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
-#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
-msgid "Analytic Plan"
-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
-#: wizard_button:wizard.crossovered.analytic,init,print:0
-msgid "Print"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml: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
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
-msgid "Analytic Distribution's Models"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml: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
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,name:0
-msgid "Plan Name"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Printing date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Percentage"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,empty_line:0
-msgid "Dont show empty lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_view:wizard.crossovered.analytic,init:0
-msgid "Select Information"
-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,journal_id:0
-#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "100.00%"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,ref:0
-msgid "Analytic Account Ref."
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Analytic Account :"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.line:0
-msgid "Analytic Plan Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Analytic Account Reference:"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.wizard,name:account_analytic_plans.create_model
-msgid "Create Model"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan,default_instance_id:0
-msgid "Default Entries"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan:0
-#: field:account.analytic.plan,plan_ids:0
-#: field:account.journal,plan_id:0
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
-msgid "Analytic Plans"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,min_required:0
-msgid "Minimum Allowed (%)"
-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
-#: wizard_view:create.model,info:0
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-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
-#: model:ir.module.module,description:account_analytic_plans.module_meta_information
-msgid "This module allows to use several analytic plans, according to the general journal,\n"
+"This module allows to use several analytic plans, according to the general "
+"journal,\n"
 "so that multiple analytic lines are created when the invoice or the entries\n"
 "are confirmed.\n"
 "\n"
@@ -614,7 +251,8 @@ msgid "This module allows to use several analytic plans, according to the genera
 "Plan2:\n"
 "    Eric: 100%\n"
 "\n"
-"So when this line of invoice will be confirmed, it will generate 3 analytic lines,\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,\n"
 "for one account entry.\n"
 "        "
 msgstr ""
@@ -687,7 +325,8 @@ msgstr ""
 
 #. module: account_analytic_plans
 #: wizard_view:create.model,info:0
-msgid "This distribution model has been saved. You will be able to reuse it later."
+msgid ""
+"This distribution model has been saved. You will be able to reuse it later."
 msgstr ""
 
 #. module: account_analytic_plans
@@ -733,4 +372,3 @@ msgstr ""
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
 msgstr ""
-
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index a8293d1fa7e..b6f00a002f7 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 06:54+0000\n"
+"PO-Revision-Date: 2010-07-13 08:33+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-06-22 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr "科目4ID"
+msgstr "项4ID"
 
 #. module: account_analytic_plans
 #: constraint:ir.model:0
@@ -36,7 +36,7 @@ msgstr "交叉辅助核算"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr "科目5ID"
+msgstr "项5ID"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,date2:0
@@ -75,7 +75,7 @@ msgstr "打印"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr "至今为止"
+msgstr "日期到"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
@@ -90,7 +90,7 @@ msgstr "辅助核算分配模型"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr "科目名称"
+msgstr "项名称"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -135,13 +135,13 @@ msgstr "选择信息"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
 msgid "Account3 Id"
-msgstr "科目3ID"
+msgstr "项3ID"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
 #: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
 msgid "Analytic Journal"
-msgstr "辅助核算分类帐"
+msgstr "辅助核算记录集合"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -151,12 +151,12 @@ msgstr "100.00%"
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,ref:0
 msgid "Analytic Account Ref."
-msgstr "辅助核算项目参考"
+msgstr "辅助核算项参考"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr "辅助核算项目:"
+msgstr "辅助核算项:"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
@@ -166,7 +166,7 @@ msgstr "辅助核算方案明细"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
-msgstr "辅助核算项目参考:"
+msgstr "辅助核算项参考:"
 
 #. module: account_analytic_plans
 #: model:ir.actions.wizard,name:account_analytic_plans.create_model
@@ -176,7 +176,7 @@ msgstr "创建模型"
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
-msgstr "默认凭证"
+msgstr "默认记录"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -194,7 +194,7 @@ msgstr "最小允许(%)"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
 msgid "Account1 Id"
-msgstr "科目1ID"
+msgstr "项1ID"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
@@ -209,7 +209,7 @@ msgstr "分配模型保存"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
-msgstr "核算方案实例"
+msgstr "辅助核算方案实例"
 
 #. module: account_analytic_plans
 #: constraint:ir.ui.view:0
@@ -255,8 +255,8 @@ msgid ""
 "for one account entry.\n"
 "        "
 msgstr ""
-"这模块允许使用几个辅助核算方案并根据他们生成分类帐\n"
-"\t所以当开发票或确认凭证时\n"
+"这模块允许使用几个辅助核算方案并根据他们生成记录集合\n"
+"\t所以当开发票或确认记录时\n"
 "建立多个辅助核算明细\n"
 "\t\n"
 "\t例子:你可以定义以下辅助核算结构:\n"
@@ -307,7 +307,7 @@ msgstr "模型方案"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr "科目2ID"
+msgstr "项2ID"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -317,12 +317,12 @@ msgstr "金额"
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
 msgid "Root account of this plan."
-msgstr "这方案的根辅助核算项目"
+msgstr "这方案的根辅助核算项"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr "科目6ID"
+msgstr "项6ID"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -332,7 +332,7 @@ msgstr "数量"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr "科目ID"
+msgstr "项ID"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -347,7 +347,7 @@ msgstr "确定"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
 msgid "Root Account"
-msgstr "根辅助核算项目"
+msgstr "根项"
 
 #. module: account_analytic_plans
 #: wizard_view:create.model,info:0
@@ -363,7 +363,7 @@ msgstr "序列"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account_analytic_plans
 #: field:account.analytic.default,analytics_id:0
@@ -397,4 +397,4 @@ msgstr "在"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr "根据日期"
+msgstr "日期从"
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index 825ab26aaf9..2429650a800 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -67,7 +67,6 @@ class account_crossovered_analytic(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'account.analytic.account.crossovered.analytic',
             'datas': datas,
-            'nodestroy': True
             }
 
 account_crossovered_analytic()
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 735bc9e0007..035fb47f949 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -21,7 +21,7 @@
 {
     "name"      : "Stock Accounting for Anglo Saxon countries",
     "version"   : "1.2",
-    "author"    : "Tiny, Veritos",
+    "author"    : "OpenERP SA, Veritos",
     "website"   : "http://tinyerp.com - http://veritos.nl",
     "description" : """This module will support the Anglo-Saxons accounting methodology by
     changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries
diff --git a/addons/account_anglo_saxon/i18n/nl.po b/addons/account_anglo_saxon/i18n/nl.po
new file mode 100644
index 00000000000..5c9d3ddf346
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/nl.po
@@ -0,0 +1,66 @@
+# Dutch 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: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-07-16 15:49+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-07-17 03:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr "Voorraadrekening"
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr "Prijsverschillen rekening"
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
+"Deze rekening wordt gebruikt om de prijsverschillen tussen inkoop- en "
+"kostprijs te boeken."
diff --git a/addons/account_anglo_saxon/i18n/zh_CN.po b/addons/account_anglo_saxon/i18n/zh_CN.po
new file mode 100644
index 00000000000..5014f9f025b
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/zh_CN.po
@@ -0,0 +1,64 @@
+# 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: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-07-13 08:42+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-07-14 03:37+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " 会计属性"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr "库存科目"
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "无效XML视图结构!"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr "价格差异科目"
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr "这科目将用于在采购价格和销售价格之间的价格差异"
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 253127fa6c7..5b32009efff 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -43,7 +43,7 @@ Three reports are available:
     3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts, of the Master Budgets per Budgets.
 
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 81c5e67f961..963644a21e1 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -148,7 +148,7 @@
                             <field name="state" select="1"/>
                             <group col="4" colspan="2">
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
-                                <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
+                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
                                 <button string="Done" name="done" states="validate" type="workflow"   icon="gtk-jump-to" />
                                 <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
                                 <!--<button string="Set to Draft" name="action_set_to_draft" states="cancel" type="object"/>-->
@@ -163,7 +163,7 @@
             <field name="model">crossovered.budget</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Budget">
+            	 <tree colors="blue:state in ('draft');gray:state in ('done','cancel');black:state in ('confirm','validate')" string="Budget">
                     <field name="name" colspan="1" select="1"/>
                     <field name="code" colspan="1" select="1" />
                     <field name="state"/>
@@ -181,7 +181,7 @@
                <search string="Budget">
                    <group col="20" colspan="4">
                        <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"  default="1"/>
-                       <filter string="To Validate" icon="terp-gtk-go-back-rtl" domain="[('state','=','validate')]" help="To Validate Budgets" />
+                       <filter string="To Approve" icon="terp-gtk-go-back-rtl" domain="[('state','=','validate')]" help="To Approve Budgets" />
                        <separator orientation="vertical"/>
                        <field name="name" select="1"/>
                        <field name="code" select="1" />
diff --git a/addons/account_budget/i18n/pt_BR.po b/addons/account_budget/i18n/pt_BR.po
index ab01ebba85b..73ac01931a7 100644
--- a/addons/account_budget/i18n/pt_BR.po
+++ b/addons/account_budget/i18n/pt_BR.po
@@ -7,19 +7,19 @@ 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"
-"PO-Revision-Date: 2009-09-08 16:30+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"PO-Revision-Date: 2010-07-27 20:39+0000\n"
+"Last-Translator: Leandro Chaves <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-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-07-28 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Usuário responsável"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -30,28 +30,28 @@ msgstr "% desempenho"
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
 #: model:ir.ui.menu,name:account_budget.menu_budget_post_form
 msgid "Budgetary Positions"
-msgstr ""
+msgstr "Posições Orçamentárias"
 
 #. module: account_budget
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Printed at:"
-msgstr ""
+msgstr "Impresso em:"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Confirm"
-msgstr ""
+msgstr "confirmar"
 
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
-msgstr ""
+msgstr "Validar usuário"
 
 #. module: account_budget
 #: constraint:ir.model:0
@@ -64,12 +64,12 @@ msgstr ""
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmado"
 
 #. module: account_budget
 #: field:account.budget.post.dotation,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Período"
 
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
@@ -77,61 +77,61 @@ msgstr ""
 #: wizard_field:wizard.crossovered.budget,init,date_to:0
 #: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
 msgid "End of period"
-msgstr ""
+msgstr "Fim do período"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Printing date:"
-msgstr ""
+msgstr "Data de impressão:"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Provisório"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "at"
-msgstr ""
+msgstr "em"
 
 #. module: account_budget
 #: view:account.budget.post:0
 msgid "Dotations"
-msgstr ""
+msgstr "Dotações"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Performance"
-msgstr ""
+msgstr "Desempenho"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Currency:"
-msgstr ""
+msgstr "Moeda:"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "From"
-msgstr ""
+msgstr "De"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
-msgstr ""
+msgstr "Porcentagem"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Results"
-msgstr ""
+msgstr "Resultados"
 
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: account_budget
 #: model:ir.module.module,description:account_budget.module_meta_information
@@ -162,23 +162,46 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
+"Este módulo permite um gerenciamento de orçamentos analíticos e cruzamento "
+"com outros módulos.\n"
+"\n"
+"Uma vez definido o Orçamento Principal e Orçamentos acessórios (em "
+"Finanças/Gerenciamento/Orçamento/), os Gerentes de Projeto podem marcar o "
+"montante planejado em cada Conta Analítica.\n"
+"\n"
+"O contador tem a possibilidade de ver o montante total planejado por cada "
+"Orçamento (Principal e Acessório) para poder se assegurar de que o total "
+"planejado não é maior ou menor do que o planejado para esse Orçamento. Cada "
+"lista de registros poderá ser alternada para o modo gráfico. \n"
+"\n"
+"Três relatórios estão disponíveis:\n"
+"\n"
+"1. O primeiro está disponível na Lista de Orçamentos. Este demonstra a "
+"alocação, para os Orçamentos, das Contas Analíticas por Orçamento "
+"Principal.\n"
+"2. O segundo é um resumo do primeiro. Somente demonstra a alocação, para os "
+"Orçamentos selecionados, das Contas Analíticas.\n"
+"3. O último está disponível no Plano de Contas Analítico. Demonstra a "
+"alocação, para as Contas selecionadas, do Orçamento Principal, por "
+"Orçamento.\n"
+"\n"
 
 #. module: account_budget
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "Conta Analítica:"
 
 #. module: account_budget
 #: wizard_button:account.budget.report,init,report:0
@@ -186,12 +209,12 @@ msgstr ""
 #: wizard_button:wizard.crossovered.budget,init,report:0
 #: wizard_button:wizard.crossovered.budget.summary,init,report:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "A/c No."
-msgstr ""
+msgstr "No.Cta."
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
@@ -205,60 +228,60 @@ msgstr "para"
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: field:crossovered.budget.lines,planned_amount:0
 #: rml:crossovered.budget.report:0
 msgid "Planned Amount"
-msgstr ""
+msgstr "Valor Planejado"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Perc(%)"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Period Budget"
-msgstr ""
+msgstr "Orçamento do Período"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Analysis"
-msgstr ""
+msgstr "Análise do Orçamento"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 #: selection:crossovered.budget,state:0
 msgid "Done"
-msgstr ""
+msgstr "Completo"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Validate"
-msgstr ""
+msgstr "Validar"
 
 #. module: account_budget
 #: wizard_view:wizard.crossovered.budget,init:0
 #: wizard_view:wizard.crossovered.budget.summary,init:0
 msgid "Select Options"
-msgstr ""
+msgstr "Selecione Opções"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 #: rml:crossovered.budget.report:0
 msgid "Practical Amount"
-msgstr ""
+msgstr "Valor Real"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
 #: field:crossovered.budget.lines,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Data Final"
 
 #. module: account_budget
 #: constraint:ir.ui.view:0
@@ -268,7 +291,7 @@ msgstr "Invalido XML para Arquitetura da View"
 #. module: account_budget
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
-msgstr ""
+msgstr "Valor Estimado"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
@@ -280,18 +303,18 @@ msgstr "Nome"
 #. module: account_budget
 #: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
 msgid "Print Summary of Budgets"
-msgstr ""
+msgstr "Imprimir Resumo dos Orçamentos"
 
 #. module: account_budget
 #: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
 msgid "Spread amount"
-msgstr ""
+msgstr "Valor Alocado"
 
 #. module: account_budget
 #: view:account.analytic.account:0
 #: view:account.budget.post:0
 msgid "Lines"
-msgstr ""
+msgstr "Linhas"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -302,58 +325,58 @@ msgstr ""
 #: model:ir.model,name:account_budget.model_crossovered_budget
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
 msgid "Budget"
-msgstr ""
+msgstr "Orçamento"
 
 #. module: account_budget
 #: field:account.budget.post.dotation,post_id:0
 msgid "Item"
-msgstr ""
+msgstr "Item"
 
 #. module: account_budget
 #: field:account.budget.post.dotation,amount:0
 #: wizard_field:account.budget.spread,init,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Valor"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
-msgstr ""
+msgstr "Data do Pagamento"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
 #: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
 #: model:ir.ui.menu,name:account_budget.next_id_31
 msgid "Budgets"
-msgstr ""
+msgstr "Orçamentos"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: account_budget
 #: view:account.budget.post.dotation:0
 #: model:ir.model,name:account_budget.model_account_budget_post_dotation
 msgid "Budget Dotation"
-msgstr ""
+msgstr "Dotação Orçamentária"
 
 #. module: account_budget
 #: view:account.budget.post.dotation:0
 msgid "Budget Dotations"
-msgstr ""
+msgstr "Dotações Orçamentárias"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
-msgstr ""
+msgstr "Detalhe do Item do Orçamento"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: field:crossovered.budget.lines,general_budget_id:0
 #: model:ir.model,name:account_budget.model_account_budget_post
 msgid "Budgetary Position"
-msgstr ""
+msgstr "Posição Orçamentária"
 
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date1:0
@@ -361,7 +384,7 @@ msgstr ""
 #: wizard_field:wizard.crossovered.budget,init,date_from:0
 #: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
 msgid "Start of period"
-msgstr ""
+msgstr "Início do período"
 
 #. module: account_budget
 #: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
@@ -369,49 +392,49 @@ msgstr ""
 #: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
 #: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
 msgid "Print Budgets"
-msgstr ""
+msgstr "Imprimir Orçamentos"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
 #: field:crossovered.budget,code:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: account_budget
 #: field:account.budget.post.dotation,tot_planned:0
 msgid "Total Planned Amount"
-msgstr ""
+msgstr "Valor Total Planejado"
 
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"
-msgstr ""
+msgstr "Selecione as Datas do Período"
 
 #. module: account_budget
 #: field:account.budget.post,dotation_ids:0
 msgid "Spreading"
-msgstr ""
+msgstr "Alocação"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Theoretical Amount"
-msgstr ""
+msgstr "Valor Planejado"
 
 #. module: account_budget
 #: wizard_field:account.budget.spread,init,fiscalyear:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Ano Fiscal"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta Analítica"
 
 #. module: account_budget
 #: rml:crossovered.budget.report:0
 msgid "Budget :"
-msgstr ""
+msgstr "Orçamento:"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -419,18 +442,18 @@ msgstr ""
 #: wizard_view:account.budget.spread,init:0
 #: wizard_button:account.budget.spread,init,spread:0
 msgid "Spread"
-msgstr ""
+msgstr "Alocação"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: field:account.budget.post,account_ids:0
 msgid "Accounts"
-msgstr ""
+msgstr "Contas"
 
 #. module: account_budget
 #: model:ir.actions.report.xml,name:account_budget.account_budget
 msgid "Print Budget"
-msgstr ""
+msgstr "Imprimir Orçamento"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -445,7 +468,7 @@ msgstr ""
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
-msgstr ""
+msgstr "Linhas do Orçamento"
 
 #. module: account_budget
 #: wizard_button:account.budget.report,init,end:0
@@ -455,31 +478,31 @@ msgstr ""
 #: wizard_button:wizard.crossovered.budget,init,end:0
 #: wizard_button:wizard.crossovered.budget.summary,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: account_budget
 #: model:ir.module.module,shortdesc:account_budget.module_meta_information
 msgid "Budget Management"
-msgstr ""
+msgstr "Administração do Orçamento"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
 #: field:crossovered.budget.lines,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data de Início"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Analysis from"
-msgstr ""
+msgstr "Análise de"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Validated"
-msgstr ""
+msgstr "Validado"
 
 #. module: account_budget
 #: wizard_view:account.budget.report,init:0
 msgid "Select period"
-msgstr ""
+msgstr "Selecione período"
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index 484a556fa51..88406400639 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 06:58+0000\n"
+"PO-Revision-Date: 2010-07-13 08:55+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-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr "责任用户"
+msgstr "负责用户"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -30,7 +30,7 @@ msgstr "% 执行%"
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
 #: model:ir.ui.menu,name:account_budget.menu_budget_post_form
 msgid "Budgetary Positions"
-msgstr "预算位于"
+msgstr "预算状况"
 
 #. module: account_budget
 #: constraint:ir.actions.act_window:0
@@ -75,7 +75,7 @@ msgstr "会计期间"
 #: wizard_field:wizard.crossovered.budget,init,date_to:0
 #: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
 msgid "End of period"
-msgstr "会计期间结束"
+msgstr "结束会计期间"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -183,7 +183,7 @@ msgstr ""
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
@@ -194,7 +194,7 @@ msgstr "说明"
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 msgid "Analytic Account :"
-msgstr "辅助核算项目:"
+msgstr "辅助核算项:"
 
 #. module: account_budget
 #: wizard_button:account.budget.report,init,report:0
@@ -207,7 +207,7 @@ msgstr "打印"
 #. module: account_budget
 #: rml:account.budget:0
 msgid "A/c No."
-msgstr ""
+msgstr "A/c No."
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
@@ -369,7 +369,7 @@ msgstr "预算项详情"
 #: field:crossovered.budget.lines,general_budget_id:0
 #: model:ir.model,name:account_budget.model_account_budget_post
 msgid "Budgetary Position"
-msgstr "预算位于"
+msgstr "预算状况"
 
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date1:0
@@ -377,7 +377,7 @@ msgstr "预算位于"
 #: wizard_field:wizard.crossovered.budget,init,date_from:0
 #: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
 msgid "Start of period"
-msgstr "期初日期"
+msgstr "开始会计期间"
 
 #. module: account_budget
 #: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
@@ -422,7 +422,7 @@ msgstr "会计年度"
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account_budget
 #: rml:crossovered.budget.report:0
@@ -441,7 +441,7 @@ msgstr "延伸"
 #: view:account.budget.post:0
 #: field:account.budget.post,account_ids:0
 msgid "Accounts"
-msgstr "科目"
+msgstr "项"
 
 #. module: account_budget
 #: model:ir.actions.report.xml,name:account_budget.account_budget
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index fda719a8178..6bbf304d440 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Account Cancel",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules/Accounting',
     "description": """
     Module adds 'Allow cancelling entries' field on form view of account journal. If set to true it allows user to cancel entries & invoices.
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index ca1c4a71351..f96f89fa791 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     'version': '1.1',
     'category': 'Generic Modules/Accounting',
     'description': """Remove minimal account chart""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index 2a7f30248bb..f758e04aa5b 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name"      : "Account CODA - import bank statements from coda file",
     "version"   : "1.0",
-    "author"    : "Tiny",
+    "author"    : "OpenERP SA",
     "category"  : "Account CODA",
     "description": """
     Module provides functionality to import
diff --git a/addons/account_coda/i18n/zh_CN.po b/addons/account_coda/i18n/zh_CN.po
new file mode 100644
index 00000000000..2dc2a0b20ef
--- /dev/null
+++ b/addons/account_coda/i18n/zh_CN.po
@@ -0,0 +1,169 @@
+# 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: 2009-11-24 13:11+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-07-14 03:37+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_coda
+#: field:account.coda,journal_id:0
+#: wizard_field:account.coda_import,init,journal_id:0
+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
+#: wizard_field:account.coda_import,extraction,note:0
+msgid "Log"
+msgstr "日志"
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,open:0
+msgid "_Open Statement"
+msgstr "打开对帐单"
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA"
+msgstr "帐号 CODA"
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr "Coda文件"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Clic on 'New' to select your file :"
+msgstr "点击\"新\"去选择你的文件:"
+
+#. module: account_coda
+#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
+msgid "Import Coda File"
+msgstr "导入CODA文件"
+
+#. module: account_coda
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "在动作定义使用了无效的模块名。"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "导入日志"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_receivable:0
+msgid "Default receivable Account"
+msgstr "默认应收帐款科目"
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"Module provides functionality to import\n"
+"    bank statements from .csv file.\n"
+"    Import coda file wizard is used to import bank statements."
+msgstr ""
+"模块提供导入功能\n"
+"    银行对帐单从 .csv文件\n"
+"    导入CODA文件向导用于导入银行对帐单"
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,end:0
+msgid "_Close"
+msgstr "关闭"
+
+#. module: account_coda
+#: field:account.coda,statement_id:0
+msgid "Generated Bank Statement"
+msgstr "生成银行对帐单"
+
+#. module: account_coda
+#: view:account.coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda import"
+msgstr "coda导入"
+
+#. module: account_coda
+#: field:account.coda,user_id:0
+msgid "User"
+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"
+msgstr "帐号的CODA"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_payable:0
+msgid "Default Payable Account"
+msgstr "默认应付帐款科目"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "Coda Statements"
+msgstr "CODA"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+msgid "Import Coda Statements"
+msgstr "导入CODA"
+
+#. module: account_coda
+#: wizard_button:account.coda_import,init,extraction:0
+msgid "_Ok"
+msgstr "确定"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+#: wizard_view:account.coda_import,init:0
+msgid "Import Coda Statement"
+msgstr "导入CODA"
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr "CODA"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+msgid "Results :"
+msgstr "结果:"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,coda:0
+msgid "Coda File"
+msgstr "CODA文件"
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr "导入日期"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Select your bank journal :"
+msgstr "选择你银行记录集合:"
diff --git a/addons/account_coda/wizard/__init__.py b/addons/account_coda/wizard/__init__.py
index e9214ee1e44..950c9fc8d77 100644
--- a/addons/account_coda/wizard/__init__.py
+++ b/addons/account_coda/wizard/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import account_coda_import
+import coda_import
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index 297534542b1..f62a307c3c5 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -208,7 +208,8 @@ class account_coda_import(osv.osv_memory):
                     line=lines[value]
                     reconcile_id = False
                     if line['toreconcile']:
-                        rec_id = move_line_obj.search(cr, uid, [('name', '=', line['name']), ('reconcile_id', '=', False), ('account_id.reconcile', '=', True)])
+                        name = line['name'][:3] + '/' + line['name'][3:7] + '/' + line['name'][7:]
+                        rec_id = pool.get('account.move.line').search(cr, uid, [('name','=', name),('reconcile_id','=',False),('account_id.reconcile','=',True)])
                         if rec_id:
                             reconcile_id = statement_reconcile_obj.create(cr, uid, {
                                 'line_ids': [(6, 0, rec_id)]
@@ -296,4 +297,4 @@ class account_coda_import(osv.osv_memory):
         
 account_coda_import()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_coda/wizard/coda_import.py b/addons/account_coda/wizard/coda_import.py
new file mode 100644
index 00000000000..39aa7b645cb
--- /dev/null
+++ b/addons/account_coda/wizard/coda_import.py
@@ -0,0 +1,347 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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 pooler
+import time
+import datetime
+import wizard
+import netsvc
+import base64
+from osv import osv
+from tools.translate import _
+
+codawiz_form = """<?xml version="1.0"?>
+<form string="Import Coda Statement">
+<separator colspan="4" string="Select your bank journal :" />
+    <field name="journal_id" colspan="1" domain="[('type','=','cash')]" />
+    <newline />
+    <field name="def_payable" />    <field name="def_receivable" />
+    <newline />
+    <field name="awaiting_account" />
+    <separator string="Clic on 'New' to select your file :" colspan="4"/>
+    <field name="coda"/>
+</form>
+"""
+
+codawiz_fields = {
+    'journal_id' : {
+        'string':'Bank Journal',
+        'type':'many2one',
+        'relation':'account.journal',
+        'required':True,
+
+    },
+    'coda' : {
+        'string':'Coda File',
+        'type':'binary',
+        'required':True,
+    },
+    'def_payable' : {
+        'string' : 'Default Payable Account',
+        'type' : 'many2one',
+        'relation': 'account.account',
+        'required':True,
+        'domain':[('type','=','payable')],
+        'help': 'Set here the payable account that will be used, by default, if the partner is not found',
+    },
+    'def_receivable' : {
+        'string' : 'Default receivable Account',
+        'type' : 'many2one',
+        'relation': 'account.account',
+        'required':True,
+        'domain':[('type','=','receivable')],
+        'help': 'Set here the receivable account that will be used, by default, if the partner is not found',
+    },
+    'awaiting_account' : {
+        'string' : 'Default Account for Unrecognized Movement',
+        'type' : 'many2one',
+        'relation': 'account.account',
+        'required':True,
+        'help': 'Set here the default account that will be used, if the partner is found but does not have the bank account , or if he is domiciled',
+
+    }
+
+}
+
+result_form = """<?xml version="1.0"?>
+<form string="Import Coda Statement">
+<separator colspan="4" string="Results :" />
+    <field name="note" colspan="4" nolabel="1" width="500"/>
+</form>
+"""
+
+result_fields = {
+
+    'note' : {'string':'Log','type':'text'}
+
+}
+
+
+def _coda_parsing(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    codafile = data['form']['coda']
+    journal_code = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context).code
+    def_pay_acc = data['form']['def_payable']
+    def_rec_acc = data['form']['def_receivable']
+
+    str_log = ""
+    err_log = "Errors:\n------\n"
+    nb_err=0
+    std_log=''
+    str_log1 = "Coda File is Imported  :  "
+    str_not=''
+    str_not1=''
+
+    bank_statements=[]
+    recordlist = base64.decodestring(codafile).split('\n')
+    recordlist.pop()
+    for line in recordlist:
+        if line[0] == '0':
+            # header data
+            bank_statement = {}
+            bank_statement["bank_statement_line"]={}
+            bank_statement_lines = {}
+            bank_statement['date'] = str2date(line[5:11])
+            bank_statement['journal_id']=data['form']['journal_id']
+            period_id = pool.get('account.period').search(cr,uid,[('date_start','<=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d"))),('date_stop','>=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d")))])
+            bank_statement['period_id'] = period_id[0]
+            bank_statement['state']='draft'
+        elif line[0] == '1':
+            # old balance data
+            bal_start = list2float(line[43:58])
+            if line[42] == '1':
+                bal_start = - bal_start
+            bank_statement["balance_start"]= bal_start
+            bank_statement["acc_number"]=line[5:17]
+            bank_statement["acc_holder"]=line[64:90]
+            bank_statement['name'] = journal_code + ' ' + str(line[2:5])
+
+        elif line[0]=='2':
+            # movement data record 2
+            if line[1]=='1':
+                # movement data record 2.1
+                if bank_statement_lines.has_key(line[2:6]):
+                    continue
+                st_line = {}
+                st_line['extra_note'] = ''
+                st_line['statement_id']=0
+                st_line['ref'] = line[2:10]
+                st_line['date'] = time.strftime('%Y-%m-%d',time.strptime(str2date(line[115:121]),"%y/%m/%d")),
+                st_line_amt = list2float(line[32:47])
+                if line[61]=='1':
+                    st_line['toreconcile'] = True
+                    st_line['name']=line[65:77]
+                else:
+                    st_line['toreconcile'] = False
+                    st_line['name']=line[62:115]
+
+                st_line['free_comm'] = st_line['name']
+                st_line['val_date']=time.strftime('%Y-%m-%d',time.strptime(str2date(line[47:53]),"%y/%m/%d")),
+                st_line['entry_date']=time.strftime('%Y-%m-%d',time.strptime(str2date(line[115:121]),"%y/%m/%d")),
+                st_line['partner_id']=0
+                if line[31] == '1':
+                    st_line_amt = - st_line_amt
+                    st_line['account_id'] = def_pay_acc
+                else:
+                    st_line['account_id'] = def_rec_acc
+                st_line['amount'] = st_line_amt
+                bank_statement_lines[line[2:6]]=st_line
+                bank_statement["bank_statement_line"]=bank_statement_lines
+            elif line[1] == '2':
+                st_line_name = line[2:6]
+                bank_statement_lines[st_line_name].update({'account_id': data['form']['awaiting_account']})
+
+            elif line[1] == '3':
+                # movement data record 3.1
+                st_line_name = line[2:6]
+                st_line_partner_acc = str(line[10:47]).strip()
+                cntry_number=line[10:47].strip()
+                contry_name=line[47:125].strip()
+                bank_ids = pool.get('res.partner.bank').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 = pool.get('res.partner.bank').browse(cr,uid,bank_ids[0],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 :
+                            bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_payable.id})
+                        else :
+                            bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_receivable.id})
+                else:
+                    nb_err += 1
+                    err_log += _('The bank account %s is not defined for the partner %s.\n')%(cntry_number,contry_name)
+                    bank_statement_lines[st_line_name].update({'account_id': data['form']['awaiting_account']})
+
+                bank_statement["bank_statement_line"]=bank_statement_lines
+        elif line[0]=='3':
+            if line[1] == '1':
+                st_line_name = line[2:6]
+                bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[40:113]
+            elif line[1] == '2':
+                st_line_name = line[2:6]
+                bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:115]
+            elif line[1] == '3':
+                st_line_name = line[2:6]
+                bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:100]
+        elif line[0]=='8':
+            # new balance record
+            bal_end = list2float(line[42:57])
+            if line[41] == '1':
+                bal_end = - bal_end
+            bank_statement["balance_end_real"]= bal_end
+
+        elif line[0]=='9':
+            # footer record
+            bank_statements.append(bank_statement)
+    #end for
+    bkst_list=[]
+    for statement in bank_statements:
+        try:
+            bk_st_id = pool.get('account.bank.statement').create(cr,uid,{
+                'journal_id': statement['journal_id'],
+                'date':time.strftime('%Y-%m-%d',time.strptime(statement['date'],"%y/%m/%d")),
+                'period_id':statement['period_id'],
+                'balance_start': statement["balance_start"],
+                'balance_end_real': statement["balance_end_real"],
+                'state': 'draft',
+                'name': statement['name'],
+            })
+            lines=statement["bank_statement_line"]
+            for value in lines:
+                line=lines[value]
+                reconcile_id = False
+                if line['toreconcile']:
+                    name = line['name'][:3] + '/' + line['name'][3:7] + '/' + line['name'][7:]
+                    rec_id = pool.get('account.move.line').search(cr, uid, [('name','=', name),('reconcile_id','=',False),('account_id.reconcile','=',True)])
+                    if rec_id:
+                        reconcile_id = pool.get('account.bank.statement.reconcile').create(cr, uid, {
+                            'line_ids': [(6, 0, rec_id)]
+                        }, context=context)
+                        mv = pool.get('account.move.line').browse(cr, uid, rec_id[0], context=context)
+                        if mv.partner_id:
+                            line['partner_id'] = mv.partner_id.id
+                            if line['amount'] < 0 :
+                                line['account_id'] = mv.partner_id.property_account_payable.id
+                            else :
+                                line['account_id'] = mv.partner_id.property_account_receivable.id
+                str_not1 = ''
+                if line.has_key('contry_name') and line.has_key('cntry_number'):
+                    str_not1="Partner name:%s \n Partner Account Number:%s \n Communication:%s \n Value Date:%s \n Entry Date:%s \n"%(line["contry_name"],line["cntry_number"],line["free_comm"]+line['extra_note'],line["val_date"][0],line["entry_date"][0])
+                id=pool.get('account.bank.statement.line').create(cr,uid,{
+                   'name':line['name'],
+                   'date': line['date'],
+                   'type':line['amount']>0 and 'customer' or 'supplier',
+                   'amount': line['amount'],
+                   'partner_id':line['partner_id'] or 0,
+                   'account_id':line['account_id'],
+                   'statement_id': bk_st_id,
+                   'reconcile_id': reconcile_id,
+                   'note':str_not1,
+                   'ref':line['ref'],
+                })
+
+            str_not= "\n \n Account Number: %s \n Account Holder Name: %s " %(statement["acc_number"],statement["acc_holder"])
+            std_log += "\nStatement : %s , Date  : %s, Starting Balance :  %.2f , Ending Balance : %.2f \n"\
+                      %(statement['name'], statement['date'], float(statement["balance_start"]), float(statement["balance_end_real"]))
+            bkst_list.append(bk_st_id)
+        
+        except osv.except_osv, e:
+            cr.rollback()
+            nb_err+=1
+            err_log += '\n Application Error : ' + str(e)
+            raise # REMOVEME
+
+        except Exception, e:
+            cr.rollback()
+            nb_err+=1
+            err_log += '\n System Error : '+str(e)
+            raise # REMOVEME
+        except :
+            cr.rollback()
+            nb_err+=1
+            err_log += '\n Unknown Error'
+            raise
+    err_log += '\n\nNumber of statements : '+ str(len(bkst_list))
+    err_log += '\nNumber of error :'+ str(nb_err) +'\n'
+
+    pool.get('account.coda').create(cr, uid,{
+        'name':codafile,
+        'statement_ids': [(6, 0, bkst_list,)],
+        'note':str_log1+str_not+std_log+err_log,
+        'journal_id':data['form']['journal_id'],
+        'date':time.strftime("%Y-%m-%d"),
+        'user_id':uid,
+        })
+
+    return {'note':str_log1 + std_log + err_log ,'journal_id': data['form']['journal_id'], 'coda': data['form']['coda'],'statment_ids':bkst_list}
+
+
+def str2date(date_str):
+    return time.strftime("%y/%m/%d",time.strptime(date_str,"%d%m%y"))
+
+def str2float(str):
+    try:
+        return float(str)
+    except:
+        return 0.0
+
+def list2float(lst):
+    try:
+        return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
+    except:
+        return 0.0
+
+class coda_import(wizard.interface):
+    def _action_open_window(self, cr, uid, data, context):
+        form=data['form']
+        return {
+            'domain':"[('id','in',%s)]"%(form['statment_ids']),
+            'name': 'Statement',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.bank.statement',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+        }
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : codawiz_form,
+                    'fields' : codawiz_fields,
+                    'state' : [('end', '_Close'),('extraction', '_Ok') ]}
+        },
+        'extraction' : {
+            'actions' : [_coda_parsing],
+            'result' : {'type' : 'form',
+                    'arch' : result_form,
+                    'fields' : result_fields,
+                    'state' : [('end', '_Close'),('open', '_Open Statement')]}
+        },
+        'open': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _action_open_window, 'state': 'end'}
+
+            },
+
+    }
+coda_import("account.coda_import")
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 7d47d46f926..f8772f2e50b 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -41,7 +41,7 @@
         Accounting/Reporting/Follow-Ups/All receivable entries
 
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 82e3450163a..e5639535742 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -95,7 +95,7 @@
             <field name="type">tree</field>
             <field eval="32" name="priority"/>
             <field name="arch" type="xml">
-                <tree editable="bottom" string="Partner entries">
+                <tree colors="blue:state in ('draft');black:state in ('validate')" editable="bottom" string="Partner entries">
                     <field name="date"/>
                     <field name="move_id"/>
                     <field name="ref"/>
@@ -136,7 +136,7 @@
             </field>
         </record>
 
-        <act_window domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="account.act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" view="account_move_line_partner_tree"/>
+<!--        <act_window context="{'search_default_reconcile_id':False}" domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="account.act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" view="account_move_line_partner_tree"/>-->
 
         <act_window domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]" id="act_account_partner_account_move_all" name="All receivable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
 
diff --git a/addons/account_followup/i18n/bs.po b/addons/account_followup/i18n/bs.po
index bcf9815bf0e..b0ac6a29bc6 100644
--- a/addons/account_followup/i18n/bs.po
+++ b/addons/account_followup/i18n/bs.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-07 09:15+0000\n"
+"PO-Revision-Date: 2010-08-01 15:26+0000\n"
 "Last-Translator: Bojan Markovic <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-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -35,22 +35,22 @@ msgstr "Refernca kupca:"
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 #: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
 msgid "All payable entries"
-msgstr ""
+msgstr "Sve stavke dugovanja"
 
 #. module: account_followup
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Neispravan naziv modela u definiciji zadatka."
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr ""
+msgstr "Ispisana poruka"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Amount In Currency"
-msgstr ""
+msgstr "Iznos u valuti"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -66,7 +66,7 @@ msgstr "Ukupan dug"
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(user_signature)s: User name"
-msgstr ""
+msgstr "%(user_signature)s: Korisničko ime"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
@@ -77,12 +77,12 @@ msgstr "Izabeeri partnere"
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr ""
+msgstr "Opomena"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "Dugovanje"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
@@ -92,39 +92,39 @@ msgstr "E-mail Postavke"
 #. module: account_followup
 #: field:account_followup.stat,account_type:0
 msgid "Account Type"
-msgstr "Vrsta Računa"
+msgstr "Vrsta konta"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Ref"
-msgstr ""
+msgstr "Referenca"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(followup_amount)s: Total Amount Due"
-msgstr "%(followup_amount): Ukupan dospjeli iznos"
+msgstr "%(followup_amount)s: Ukupan dospjeli iznos"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(date)s: Current Date"
-msgstr ""
+msgstr "%(date)s: Trenutni datum"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
 msgid "Latest Follow-up"
-msgstr ""
+msgstr "Poslijednja opomena"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
 msgid "Follow Ups"
-msgstr ""
+msgstr "Opomene"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,init,date:0
 msgid "Follow-up Sending Date"
-msgstr ""
+msgstr "Datum slanja opomene"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -136,17 +136,17 @@ msgstr "Opis"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Balance:"
-msgstr "Balans:"
+msgstr "Saldo"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "VAT:"
-msgstr "VAT:"
+msgstr "PDV:"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 msgid "Company"
-msgstr "Kompanija"
+msgstr "Poduzeće"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -156,7 +156,7 @@ msgstr "Datum Fakture"
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,email_subject:0
 msgid "Email Subject"
-msgstr ""
+msgstr "Predmet email-a"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -166,27 +166,27 @@ msgstr "Plaćeno"
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(line)s: Account Move lines"
-msgstr ""
+msgstr "%(line)s: Stavke unosa na kontu"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
 msgid "Latest followup"
-msgstr ""
+msgstr "Poslijednja opomena"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Partner entries"
-msgstr ""
+msgstr "Stavke partnera"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Ups Criteria"
-msgstr ""
+msgstr "Kriteriji opomena"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Partner Selection"
-msgstr "Biranje Partnera"
+msgstr "Odabir Partnera"
 
 #. module: account_followup
 #: constraint:ir.ui.view:0
@@ -196,17 +196,17 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr ""
+msgstr "Vrsta uvjeta"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,init:0
 msgid "Follow-up and Date Selection"
-msgstr ""
+msgstr "Odabir datuma i opomene"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Select partners to remind"
-msgstr ""
+msgstr "Odaberite partnere za opomenu"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -230,6 +230,19 @@ msgid ""
 "Best Regards,\n"
 "\t\t\t"
 msgstr ""
+"\n"
+"Poštovani %(partner_name)s,\n"
+"\n"
+"Zanemarite ovu poruku ukoliko je u pitanju naša greška. Izgleda da je "
+"slijedeći iznos ostao neplaćen. Molimo Vas da poduzmete mjere potrebne da se "
+"ovaj dug izmiri u narednih 8 dana.\n"
+"\n"
+"Ukoliko ste izvršili uplatu nako što je ova poruka poslana, molimo vas da "
+"zanemarite ovu poruku. Ne ustručavajte se kontaktirati nas na broj: (br. "
+"telefona).\n"
+"\n"
+"Srdačan pozdrav.\n"
+"\t\t\t"
 
 #. module: account_followup
 #: constraint:ir.model:0
@@ -247,55 +260,55 @@ msgstr "U redu"
 #: field:account_followup.followup,name:0
 #: field:account_followup.followup.line,name:0
 msgid "Name"
-msgstr "Ime"
+msgstr "Naziv"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
 msgid "First move"
-msgstr ""
+msgstr "Prvo knjiženje"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "End of Month"
-msgstr "Kraj Mjeseca"
+msgstr "Kraj mjeseca"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(company_name)s: User's Company name"
-msgstr ""
+msgstr "%(company_name)s: Naziv poduzeća korisnika"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
 #: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile
 msgid "All receivable entries"
-msgstr ""
+msgstr "Sve stavke potraživanja"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Lines"
-msgstr "Linije"
+msgstr "Stavke"
 
 #. module: account_followup
 #: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard
 #: model:ir.ui.menu,name:account_followup.account_followup_wizard_menu
 msgid "Send followups"
-msgstr "Pošaljite napomene"
+msgstr "Pošaljite opomene"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 msgid "Follow-up Level"
-msgstr "Stupanj napomene"
+msgstr "Stupanj opomene"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "Potraživanje"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup statistics"
-msgstr ""
+msgstr "Statistike opomena"
 
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,init,next:0
@@ -305,49 +318,49 @@ msgstr "Nastavi"
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
-msgstr ""
+msgstr "Upravljanje računovodstvenim opomenama"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,summary:0
 #: wizard_field:account_followup.followup.print.all,summary,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sažetak"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Lines"
-msgstr ""
+msgstr "Stavke opomene"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr ""
+msgstr "Dokument : Izvod konta kupca"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-Up lines"
-msgstr ""
+msgstr "Stavke opomene"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr "%(company_currency): Valuta poduzeća korisnika"
+msgstr "%(company_currency)s: Valuta poduzeća korisnika"
 
 #. module: account_followup
 #: field:account_followup.stat,balance:0
 msgid "Balance"
-msgstr "Balans"
+msgstr "Saldo"
 
 #. module: account_followup
 #: help:account_followup.followup.print.all,init,date:0
 msgid ""
 "This field allow you to select a forecast date to plan your follow-ups"
-msgstr ""
+msgstr "Ovo polje omogućuje odabir budućeg datuma za planiranje opomena"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr ""
+msgstr "Ukupno potražuje"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -373,16 +386,35 @@ msgid ""
 "Best Regards,\n"
 "\t\t\t"
 msgstr ""
+"\n"
+"Poštovani %(partner_name)s,\n"
+"\n"
+"Razočarani smo što ste, usprkos našoj napomeni, sada u ozbiljnom "
+"prekoračenju plaćanja.\n"
+"\n"
+"Neophodno je da odmah izmirite svoja dugovanja, u suprotnom morati ćemo "
+"razmotriti obustavljanje naše suradnje.\n"
+"\n"
+"Molimo Vas da poduzmete neophodne mjere da se dugovanje izmiri odmah.\n"
+"\n"
+"Ukoliko postoje problemi sa plaćanjem kojih mi možda nismo svjesni, ne "
+"ustručavajte se kontaktirati naše računovodstvo na broj (br. tel.) tako da "
+"odmah pristupimo rješavanju problema.\n"
+"\n"
+"Detalji dospjelih potraživanje su ispod.\n"
+"\n"
+"Srdačan pozdrav,\n"
+"\t\t\t"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Sub-Total:"
-msgstr ""
+msgstr "Suma:"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
-msgstr ""
+msgstr "Ukupno dana"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
@@ -391,7 +423,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat
 msgid "Follow-Ups"
-msgstr ""
+msgstr "Opomene"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
@@ -402,17 +434,17 @@ msgstr "E-mail tekst"
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 msgid "Last move"
-msgstr ""
+msgstr "Poslijenje knjiženje"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Maturity"
-msgstr "Dospijeće"
+msgstr "Dospjelost"
 
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Followup Report"
-msgstr "Izvještaj o napomenama"
+msgstr "Izvještaj o opomenama"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -434,17 +466,34 @@ msgid ""
 "Best Regards,\n"
 "\t\t\t"
 msgstr ""
+"\n"
+"Poštovani %(partner_name)s,\n"
+"\n"
+"Usprkos slanju nekoliko napomena, vaš dug nije izmiren.\n"
+"\n"
+"Ukoliko ne izvršite uplatu dugovanja u narednih 8 dana, poduzeti ćemo "
+"zakonom predviđene mjere za povrat duga bez daljih upozorenja.\n"
+"\n"
+"Vjerujemo da do toga neće morati doći te Vam ponovo dostavljamo detalje "
+"dospjelih potraživanja.\n"
+"\n"
+"U slučaju bilo kakvih nejasnoća vezanih uz ovo pitanje, ne ustručavajte se "
+"kontaktirati naše računovodstvo na \n"
+"(br. tel.)\n"
+"\n"
+"S poštovanjem.\n"
+"\t\t\t"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Maturity Date"
-msgstr "Datum Dospijeać"
+msgstr "Datum dospjelosti"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Legend"
-msgstr ""
+msgstr "Legenda"
 
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
@@ -460,7 +509,7 @@ msgstr "%(heading)s: Zaglavlje retka izmjena"
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(partner_name)s: Partner name"
-msgstr ""
+msgstr "%(partner_name)s: Naziv partnera"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,email_conf:0
@@ -470,7 +519,7 @@ msgstr "Pošalji e-mail potvrdu"
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,init,followup_id:0
 msgid "Follow-up"
-msgstr ""
+msgstr "Opomena"
 
 #. module: account_followup
 #: field:account_followup.stat,name:0
@@ -491,4 +540,4 @@ msgstr "Dani kašnjenja"
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,next,print:0
 msgid "Print Follow Ups & Send Mails"
-msgstr ""
+msgstr "Ispiši opomene i pošalji email-ove"
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index 1b2d7facdc2..1224effdbc6 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:04+0000\n"
+"PO-Revision-Date: 2010-07-13 09:42+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-06-22 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Date :"
-msgstr "打印日期:"
+msgstr "日期:"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,partner_ids:0
@@ -35,12 +35,12 @@ msgstr "客户参考:"
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 #: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
 msgid "All payable entries"
-msgstr "所有应付款凭证"
+msgstr "所有应付款"
 
 #. module: account_followup
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义使用了无效的模块名。"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
@@ -66,7 +66,7 @@ msgstr "借方合计"
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(user_signature)s: User name"
-msgstr "%(user_signature)s:用户名 %(user_signature)"
+msgstr "%(user_signature)s：用户名"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
@@ -176,7 +176,7 @@ msgstr "最近跟进"
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Partner entries"
-msgstr "业务伙伴凭证"
+msgstr "业务伙伴记录"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
@@ -191,7 +191,7 @@ msgstr "业务伙伴选择"
 #. module: account_followup
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构XML文件!"
+msgstr "无效XML视图结构!"
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
@@ -211,7 +211,7 @@ msgstr "给业务伙伴一个提醒电子邮件"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Li."
-msgstr ""
+msgstr "Li."
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -242,7 +242,7 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,summary,end:0
@@ -269,7 +269,7 @@ msgstr "月末"
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(company_name)s: User's Company name"
-msgstr "公司名称:%(company_currency)s"
+msgstr "用户公司名称:%(company_currency)s"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
@@ -291,7 +291,7 @@ msgstr "发送跟进"
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 msgid "Follow-up Level"
-msgstr "跟进期限"
+msgstr "跟进等级"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
@@ -327,7 +327,7 @@ msgstr "跟进明细"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr "客户科目报表"
+msgstr "文档: 客户科目对帐单"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -337,7 +337,7 @@ msgstr "跟进明细"
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr "当前公司:%(company_currency)s"
+msgstr "当前用户公司:%(company_currency)s"
 
 #. module: account_followup
 #: field:account_followup.stat,balance:0
@@ -379,6 +379,17 @@ msgid ""
 "Best Regards,\n"
 "\t\t\t"
 msgstr ""
+"\n"
+"尊敬的%(partner_name)s,\n"
+"\n"
+"我们不得不发这个通知, 你的帐户已经严重逾期\n"
+"请立即支付, 否则我们不得不停止你的帐户, 并停止一切业务.\n"
+"\n"
+"请采取措施确保在8天内支付.\n"
+"如有疑问请立即联系我们.\n"
+"                                                                             "
+"                 商祺\n"
+"\t\t\t"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -413,7 +424,7 @@ msgstr "最后"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Maturity"
-msgstr "到期"
+msgstr "到期日期"
 
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
@@ -459,7 +470,7 @@ msgstr "到期日期"
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Legend"
-msgstr "说明"
+msgstr "图表"
 
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
@@ -508,9 +519,6 @@ msgstr "拖延天数"
 msgid "Print Follow Ups & Send Mails"
 msgstr "打印跟进&发送电子邮件"
 
-#~ msgid "Follow-up Message"
-#~ msgstr "跟进消息"
-
 #~ msgid ""
 #~ "\n"
 #~ "    Modules to automate letters for unpaid invoices, with multi-level "
@@ -551,11 +559,3 @@ msgstr "打印跟进&发送电子邮件"
 #~ "注意:如果你想要变更一业务伙伴/凭证的跟进级别,你可以在菜单:\n"
 #~ "          财务管理/报表/跟进/所有应收账款凭证\n"
 #~ "\n"
-
-#~ msgid ""
-#~ "Do not change message text, if you want to send email in partner language, "
-#~ "or configre from company"
-#~ msgstr "如果你想在发送的电子邮件中用业务伙伴的语言,请不要改变着消息的文本"
-
-#~ msgid "Send Email in Partner Language"
-#~ msgstr "发送到业务伙伴Email的语言"
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 868249365ee..c3fd73370eb 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -304,7 +304,6 @@ class account_followup_print_all(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'account_followup.followup.print',
             'datas': datas,
-            'nodestroy': True
             }
 
 account_followup_print_all()
diff --git a/addons/account_invoice_layout/__openerp__.py b/addons/account_invoice_layout/__openerp__.py
index 8692385179e..c0503539956 100644
--- a/addons/account_invoice_layout/__openerp__.py
+++ b/addons/account_invoice_layout/__openerp__.py
@@ -35,7 +35,7 @@
     Moreover, there is one option which allows you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions...
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'account'],
     'init_xml': [],
diff --git a/addons/account_invoice_layout/i18n/bs.po b/addons/account_invoice_layout/i18n/bs.po
index 91f8f8eff7b..83246875150 100644
--- a/addons/account_invoice_layout/i18n/bs.po
+++ b/addons/account_invoice_layout/i18n/bs.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-07 09:53+0000\n"
+"PO-Revision-Date: 2010-08-01 12:20+0000\n"
 "Last-Translator: Bojan Markovic <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-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -36,7 +36,7 @@ msgstr ""
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Cancelled Invoice"
-msgstr "Poništena faktura"
+msgstr "Opozvana faktura"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -93,7 +93,7 @@ msgstr "Napomeni po porukama"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "PRO-FORMA"
-msgstr "PRO-FORMA"
+msgstr "Pro-forma"
 
 #. module: account_invoice_layout
 #: field:account.invoice,abstract_line_ids:0
@@ -113,7 +113,7 @@ msgstr "Poruka napomene"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Customer Ref:"
-msgstr "Referenca kupca"
+msgstr "Referenca kupca:"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -183,7 +183,7 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Page Break"
-msgstr ""
+msgstr "Prelom stranice"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -263,7 +263,7 @@ msgstr "Faktura dobavljača"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Note :"
-msgstr ""
+msgstr "Napomena :"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
diff --git a/addons/account_invoice_layout/i18n/zh_CN.po b/addons/account_invoice_layout/i18n/zh_CN.po
index 152a4cbf20f..3028ea58131 100644
--- a/addons/account_invoice_layout/i18n/zh_CN.po
+++ b/addons/account_invoice_layout/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:11+0000\n"
+"PO-Revision-Date: 2010-07-13 10:00+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-06-22 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -30,12 +30,12 @@ msgstr "发票日期:"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Cancelled Invoice"
-msgstr "取消发票"
+msgstr "被取消的发票"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -82,7 +82,7 @@ msgstr "单价"
 #. module: account_invoice_layout
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义使用了无效的模块名。"
 
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_notify_message
@@ -102,7 +102,7 @@ msgstr "发票明细"
 #. module: account_invoice_layout
 #: view:account.invoice.line:0
 msgid "Seq."
-msgstr "序号"
+msgstr "序列"
 
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
@@ -117,7 +117,7 @@ msgstr "客户参考"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
@@ -132,7 +132,7 @@ msgstr "价格"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "/ ("
-msgstr ""
+msgstr "/ ("
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -187,12 +187,12 @@ msgstr "分页符"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Document:"
-msgstr "票据:"
+msgstr "文档："
 
 #. module: account_invoice_layout
 #: wizard_view:wizard.notify_message,init:0
 msgid "Select Message"
-msgstr "选择消息"
+msgstr "选择信息"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
@@ -242,7 +242,7 @@ msgstr "数量"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Refund"
-msgstr "退货"
+msgstr "退还"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -252,7 +252,7 @@ msgstr "增值税"
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Separator Line"
-msgstr "分割线"
+msgstr "分隔线"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -267,17 +267,17 @@ msgstr "备注:"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Tax"
-msgstr "税金"
+msgstr "税"
 
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "account_invoice_layout"
-msgstr ""
+msgstr "发票式样"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Total (Excl. taxes):"
-msgstr "(不含税):"
+msgstr "合计(不含税):"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -292,7 +292,7 @@ msgstr "取消"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Supplier Refund"
-msgstr "供应商退货"
+msgstr "供应商退还"
 
 #. module: account_invoice_layout
 #: wizard_field:wizard.notify_message,init,message:0
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index cd0e162df17..f3e437face2 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name": "Payment Management",
     "version": "1.1",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "category": "Generic Modules/Payment",
     "depends": ["account"],
     "init_xml": [],
@@ -32,7 +32,7 @@
     * a more efficient way to manage invoice payment.
     * a basic mechanism to easily plug various automated payment.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['account'],
     'init_xml': [],
     'update_xml': [
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 27455183afd..ca583188a63 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -93,8 +93,8 @@ class account_move_line(osv.osv):
                 context=context)
         for line in self.browse(cr, uid, ids, context=context):
             line2bank[line.id] = False
-            if line.invoice and line.invoice.partner_bank:
-                line2bank[line.id] = line.invoice.partner_bank.id
+            if line.invoice and line.invoice.partner_bank_id:
+                line2bank[line.id] = line.invoice.partner_bank_id.id
             elif line.partner_id:
                 if not line.partner_id.bank_ids:
                     #raise osv.except_osv(_('Error !'), _('Partner '+ line.partner_id.name+ ' has no bank account defined'))
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 29798d34b91..bb1b2a5be4b 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -177,7 +177,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Payment order">
+                <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" editable="bottom" string="Payment order">
                     <field name="reference"/>
                     <field name="mode"/>
                     <field name="date_planned"/>
@@ -207,7 +207,7 @@
         </record>
 
         <record id="action_payment_order_open" model="ir.actions.act_window">
-            <field name="name">Payment Orders to Validate</field>
+            <field name="name">Payment Orders to Approve</field>
             <field name="res_model">payment.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index 0c595581354..eabda793496 100644
--- a/addons/account_payment/i18n/cs.po
+++ b/addons/account_payment/i18n/cs.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-07 22:24+0000\n"
-"Last-Translator: mitev.dmitry <Unknown>\n"
+"PO-Revision-Date: 2010-07-13 10:09+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-06-22 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -29,7 +29,7 @@ msgstr ""
 #. module: account_payment
 #: view:payment.order:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Uložit jako návrh"
 
 #. module: account_payment
 #: help:payment.order,mode:0
@@ -39,7 +39,7 @@ msgstr ""
 #. module: account_payment
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Špatný název modelu v definici akce"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -85,7 +85,7 @@ msgstr ""
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "Účet příchozí linky"
 
 #. module: account_payment
 #: wizard_button:populate_payment,search,create:0
@@ -358,6 +358,7 @@ msgstr ""
 
 #. module: account_payment
 #: rml:payment.order:0
+#: wizard_field:populate_statement,init,d_date:0
 msgid "Date"
 msgstr ""
 
@@ -385,6 +386,7 @@ msgstr ""
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
+#: selection:populate_statement,init,date_select:0
 msgid "Maturity Date"
 msgstr ""
 
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 0481f778d2a..13591d2cb00 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-04 13:32+0000\n"
-"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
+"PO-Revision-Date: 2010-07-13 11: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-06-22 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
 #: field:payment.order,date_planned:0
 msgid "Scheduled date if fixed"
-msgstr "预定日期如果是固定"
+msgstr "指定日期(如果是固定)"
 
 #. module: account_payment
 #: field:payment.line,currency:0
@@ -39,21 +39,23 @@ msgstr "选择使用的付款方式"
 #. module: account_payment
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义使用了无效的模块名。"
 
 #. module: account_payment
 #: view:payment.line:0
 #: field:payment.line,info_owner:0
 #: view:payment.order:0
 msgid "Owner Account"
-msgstr "自己的账号"
+msgstr "所有者科目"
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
 msgid ""
 "The amount which should be paid at the current date\n"
 "minus the amount which is already in payment order"
-msgstr "该金额应在当前日期支付扣减付款单"
+msgstr ""
+"在当前日期应支付的金额\n"
+"减去的金额在付款单中"
 
 #. module: account_payment
 #: help:payment.line,date:0
@@ -75,7 +77,7 @@ msgstr "自由"
 #. module: account_payment
 #: wizard_field:populate_payment,search,entries:0
 msgid "Entries"
-msgstr "凭证"
+msgstr "记录"
 
 #. module: account_payment
 #: wizard_field:populate_payment,init,duedate:0
@@ -85,7 +87,7 @@ msgstr "到期日期"
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr "凭证明细"
+msgstr "分录明细"
 
 #. module: account_payment
 #: wizard_button:populate_payment,search,create:0
@@ -111,7 +113,7 @@ msgstr "公司货币的合计"
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Cancelled"
-msgstr "取消"
+msgstr "已取消"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
@@ -172,12 +174,12 @@ msgstr "付款明细"
 #. module: account_payment
 #: help:payment.order,date_planned:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
-msgstr "如果你选择的优先日期是固定的选择一个日期"
+msgstr "如果你选择的优先日期是固定的, 选择一个日期"
 
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Structured"
-msgstr "规范"
+msgstr "已安排"
 
 #. module: account_payment
 #: field:payment.order,state:0
@@ -213,7 +215,7 @@ msgid ""
 "Choose an option for the Payment Order:'Fixed' stands for a date specified "
 "by you.'Directly' stands for the direct execution.'Due date' stands for the "
 "scheduled date of execution."
-msgstr "选择付款单选项‘固定’由你指定一个指定的日期.‘直接’直接执行.‘预定日期’指定一个时间表的日期执行."
+msgstr "选择付款单选项‘固定’由你指定一个指定的日期. ‘直接’表示直接执行. ‘到期日期’指定一个时间表的日期执行."
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -239,7 +241,7 @@ msgstr "目标科目"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Desitination Account"
-msgstr "目标账号"
+msgstr "目标科目"
 
 #. module: account_payment
 #: constraint:ir.ui.view:0
@@ -266,7 +268,7 @@ msgstr "当前金额合计"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Make Payments"
-msgstr "付款"
+msgstr "建立付款"
 
 #. module: account_payment
 #: field:payment.line,state:0
@@ -343,7 +345,7 @@ msgstr "贷方合计"
 #. module: account_payment
 #: model:ir.actions.wizard,name:account_payment.wizard_populate_payment
 msgid "Populate payment"
-msgstr "填写付款"
+msgstr "填入付款"
 
 #. module: account_payment
 #: field:payment.order,user_id:0
@@ -358,6 +360,7 @@ msgstr "付款明细"
 
 #. module: account_payment
 #: rml:payment.order:0
+#: wizard_field:populate_statement,init,d_date:0
 msgid "Date"
 msgstr "日期"
 
@@ -385,8 +388,9 @@ msgstr "创建日期"
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
+#: selection:populate_statement,init,date_select:0
 msgid "Maturity Date"
-msgstr "到期日期"
+msgstr "付款到期日期"
 
 #. module: account_payment
 #: view:account.bank.statement:0
@@ -459,7 +463,7 @@ msgstr "信息"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: account_payment
 #: model:ir.actions.wizard,name:account_payment.wizard_pay_payment
@@ -486,7 +490,7 @@ msgstr "在公司货币的付款金额"
 #. module: account_payment
 #: wizard_view:populate_payment,init:0
 msgid "Search Payment lines"
-msgstr "付款明细"
+msgstr "查询付款明细"
 
 #. module: account_payment
 #: field:payment.line,amount_currency:0
@@ -501,18 +505,18 @@ msgstr "沟通2"
 #. module: account_payment
 #: field:payment.line,bank_id:0
 msgid "Destination Bank account"
-msgstr "银行账号"
+msgstr "目标银行帐号"
 
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Cash Journal for the Payment Mode"
-msgstr "付款方式的现金分类帐"
+msgstr "付款方式的现金记录集合"
 
 #. module: account_payment
 #: field:payment.mode,bank_id:0
 #: rml:payment.order:0
 msgid "Bank account"
-msgstr "银行账号"
+msgstr "银行帐号"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -535,7 +539,7 @@ msgstr "付款"
 #. module: account_payment
 #: field:payment.line,move_line_id:0
 msgid "Entry line"
-msgstr ""
+msgstr "明细"
 
 #. module: account_payment
 #: help:payment.line,communication:0
@@ -559,12 +563,12 @@ msgstr "查找"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Entry Information"
-msgstr "凭证信息"
+msgstr "信息"
 
 #. module: account_payment
 #: model:ir.actions.wizard,name:account_payment.wizard_populate_statement
 msgid "Populate Statement with Payment lines"
-msgstr "填写付款明细"
+msgstr "填入付款明细"
 
 #. module: account_payment
 #: field:payment.line,order_id:0
@@ -607,12 +611,12 @@ msgstr "付款方式"
 #. module: account_payment
 #: help:payment.mode,bank_id:0
 msgid "Bank Account for the Payment Mode"
-msgstr "银行账号付款方式"
+msgstr "这付款方式的银行帐号"
 
 #. module: account_payment
 #: field:payment.mode,journal:0
 msgid "Journal"
-msgstr "分类帐"
+msgstr "记录集合"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index 81f5e4a570f..74409cab3fa 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -88,7 +88,7 @@ class payment_order_create(osv.osv_memory):
                 'date': date_to_pay,
                 'currency': line.invoice and line.invoice.currency_id.id or False,
                 }, context=context)
-        return {'nodestroy':True,}
+        return {}
 
     def search_entries(self, cr, uid, ids, context=None):
         order_obj = self.pool.get('payment.order')
diff --git a/addons/account_report/__openerp__.py b/addons/account_report/__openerp__.py
index 5cdacedce34..07afc6ed58f 100644
--- a/addons/account_report/__openerp__.py
+++ b/addons/account_report/__openerp__.py
@@ -29,7 +29,7 @@
     Indicators
     Add a dashboards for accountant that include  Indicators reporting.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
diff --git a/addons/account_report/account_report.xml b/addons/account_report/account_report.xml
index 48273cdd3b3..07db255d4c4 100644
--- a/addons/account_report/account_report.xml
+++ b/addons/account_report/account_report.xml
@@ -5,7 +5,7 @@
 
         <report auto="False" id="report_print_indicators" model="account.report.history" name="print.indicators" rml="account_report/report/print_indicator.rml" string="Indicators"/>
 
-		<report
+        <report
             auto="False"
             id="report_indicator_pdf"
             menu="False"
diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index 82fb48e5e8b..bec76093070 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -90,8 +90,12 @@
             <field name="domain"/>
             <field name="view_id" ref="view_account_report_tree_simple"/>
         </record>
+        <menuitem 
+            parent="account.menu_finance_generic_reporting" 
+            id="menu_menu_finance_generic_reporting" 
+            name="Reporting"/>
 
-        <menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="account.menu_finance_configuration" sequence="20"/>
+        <menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="menu_menu_finance_generic_reporting" sequence="20"/>
 
         <record id="view_account_report_tree" model="ir.ui.view">
             <field name="name">account.report.report.tree</field>
@@ -110,14 +114,14 @@
         </record>
 
         <record id="action_account_report_tree_view" model="ir.actions.act_window">
-            <field name="name">Custom reporting</field>
+            <field name="name">Custom Reporting</field>
             <field name="res_model">account.fiscalyear</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_account_report_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="account.menu_finance_generic_reporting" sequence="5"/>
-
+        
+        <menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="menu_menu_finance_generic_reporting" sequence="5"/>
 
         <record id="action_account_report_tree_view_fiscal" model="ir.actions.act_window">
             <field name="name">Fiscal Statements reporting</field>
diff --git a/addons/account_report/board_account_report_view.xml b/addons/account_report/board_account_report_view.xml
index 66c015e1974..0467db65cf1 100644
--- a/addons/account_report/board_account_report_view.xml
+++ b/addons/account_report/board_account_report_view.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
         <record id="board_account_report_form" model="ir.ui.view">
             <field name="name">board.account.report.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="account.board_account_form"/>              
+            <field name="inherit_id" ref="account.board_account_form"/>              
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child2" position="inside"> 
-				<button colspan="4" icon="terp-purchase" name="%(account_report.action_account_report_tree_view_indicator)d" string="My indicators" type="action"/>
-			</xpath>
+                <xpath expr="/form/hpaned/child2/action[@string='Aged receivables']" position="before"> 
+                    <button colspan="4" icon="terp-purchase" name="%(account_report.action_account_report_tree_view_indicator)d" string="My indicators" type="action"/>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/account_report/i18n/bs.po b/addons/account_report/i18n/bs.po
index bd0c14775ad..e9935b69256 100644
--- a/addons/account_report/i18n/bs.po
+++ b/addons/account_report/i18n/bs.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-09 06:46+0000\n"
+"PO-Revision-Date: 2010-08-01 17:48+0000\n"
 "Last-Translator: Bojan Markovic <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-07-10 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
@@ -21,7 +21,7 @@ msgstr ""
 #: selection:account.report.report,type:0
 #: model:ir.model,name:account_report.model_account_report_history
 msgid "Indicator"
-msgstr ""
+msgstr "Indikator"
 
 #. module: account_report
 #: wizard_field:print.indicators.pdf,init,file:0
@@ -81,7 +81,7 @@ msgstr "= Limit indikatora dobrote:"
 #. module: account_report
 #: view:account.report.report:0
 msgid "Very bad"
-msgstr ""
+msgstr "Vrlo loše"
 
 #. module: account_report
 #: field:account.report.history,val:0
@@ -92,38 +92,38 @@ msgstr "Vrijednost"
 #. module: account_report
 #: view:account.report.report:0
 msgid "= Badness Indicator Limit:"
-msgstr ""
+msgstr "= Limit indikatora za loše:"
 
 #. module: account_report
 #: view:account.report.report:0
 #: selection:account.report.report,status:0
 msgid "Bad"
-msgstr ""
+msgstr "Loše"
 
 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
 msgid "Select the PDF file on which Indicators will be printed."
-msgstr ""
+msgstr "Odaberi PDF datoteku na kojoj će indikatori biti ispisani"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "> Goodness Indicator Limit:"
-msgstr ""
+msgstr "> Limit indikatora dobrog:"
 
 #. module: account_report
 #: field:account.report.report,badness_limit:0
 msgid "Badness Indicator Limit"
-msgstr ""
+msgstr "Limit indikatora lošeg"
 
 #. module: account_report
 #: selection:account.report.report,status:0
 msgid "Very Bad"
-msgstr ""
+msgstr "Vrlo loše"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
 msgid "Indicator history"
-msgstr ""
+msgstr "Istorija indikatora"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -143,7 +143,7 @@ msgstr "Fiskalni izvod"
 #. module: account_report
 #: wizard_button:print.indicators,init,next:0
 msgid "Next"
-msgstr ""
+msgstr "Slijedeći"
 
 #. module: account_report
 #: model:ir.module.module,shortdesc:account_report.module_meta_information
@@ -154,12 +154,12 @@ msgstr "Izvještavanje za računovodstvo"
 #: wizard_button:print.indicators,next,print:0
 #: wizard_button:print.indicators.pdf,init,print:0
 msgid "Print"
-msgstr ""
+msgstr "Ispis"
 
 #. module: account_report
 #: field:account.report.report,type:0
 msgid "Type"
-msgstr ""
+msgstr "Vrsta"
 
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
@@ -169,18 +169,18 @@ msgstr "Ispiši indikatore u PDF"
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Tax Code:"
-msgstr ""
+msgstr "Porezni broj konta"
 
 #. module: account_report
 #: view:account.report.report:0
 #: selection:account.report.report,status:0
 msgid "Good"
-msgstr ""
+msgstr "Dobro"
 
 #. module: account_report
 #: view:account.report.history:0
 msgid "Account Report History"
-msgstr ""
+msgstr "Istorija izvještaja konta"
 
 #. module: account_report
 #: constraint:ir.ui.view:0
@@ -190,12 +190,12 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
 #. module: account_report
 #: help:account.report.report,badness_limit:0
 msgid "This Value sets the limit of badness."
-msgstr ""
+msgstr "Ova vrijednost postavlja limit lošeg."
 
 #. module: account_report
 #: wizard_field:print.indicators,init,select_base:0
 msgid "Choose Criteria"
-msgstr ""
+msgstr "Odaberite kriterij"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -205,39 +205,39 @@ msgstr ""
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Credit:"
-msgstr ""
+msgstr "Potraživanje konta:"
 
 #. module: account_report
 #: wizard_view:print.indicators,init:0
 msgid "Select the criteria based on which Indicators will be printed."
-msgstr ""
+msgstr "Odaberite kriterije prema kojima će indikatori biti ispisani."
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "< Badness Indicator Limit:"
-msgstr ""
+msgstr "< Limit indikatora lođeg:"
 
 #. module: account_report
 #: view:account.report.report:0
 #: selection:account.report.report,status:0
 msgid "Very Good"
-msgstr ""
+msgstr "Vrlo dobro"
 
 #. module: account_report
 #: field:account.report.report,note:0
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: account_report
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Currency:"
-msgstr ""
+msgstr "Valuta:"
 
 #. module: account_report
 #: field:account.report.report,status:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_report
 #: help:account.report.report,disp_tree:0
@@ -245,6 +245,9 @@ msgid ""
 "When the indicators are printed, if one indicator is set with this field to "
 "True, then it will display one more graphs with all its children in tree"
 msgstr ""
+"Kad su indikatori ispisani, ako je jedan od indikatora postavljen sa ovim "
+"poljem, prikazat će jedan ili više grafova sa svim svojim podindikatorima u "
+"stablu."
 
 #. module: account_report
 #: selection:account.report.report,status:0
@@ -254,32 +257,32 @@ msgstr "Normalno"
 #. module: account_report
 #: view:account.report.report:0
 msgid "Example: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
-msgstr ""
+msgstr "Npr: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
 
 #. module: account_report
 #: field:account.report.report,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: account_report
 #: field:account.report.report,disp_tree:0
 msgid "Display Tree"
-msgstr ""
+msgstr "Prikaz stabla"
 
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based On Fiscal Years"
-msgstr ""
+msgstr "Bazirano na fiskalnim godinama"
 
 #. module: account_report
 #: model:ir.model,name:account_report.model_account_report_report
 msgid "Account reporting"
-msgstr ""
+msgstr "Izvještavanje za konto"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Balance:"
-msgstr ""
+msgstr "Saldo konta:"
 
 #. module: account_report
 #: rml:print.indicators:0
@@ -299,62 +302,63 @@ msgstr "Izraz"
 #. module: account_report
 #: view:account.report.report:0
 msgid "Accounting reporting"
-msgstr ""
+msgstr "Izvještavanje za računovodsvto"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_form
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_form
 msgid "New Reporting Item Formula"
-msgstr ""
+msgstr "Formula nove stavke izvještavanja"
 
 #. module: account_report
 #: field:account.report.report,code:0
 #: rml:accounting.report:0
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: account_report
 #: field:account.report.history,tmp:0
 msgid "temp"
-msgstr ""
+msgstr "temp"
 
 #. module: account_report
 #: field:account.report.history,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Period"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "General"
-msgstr ""
+msgstr "Općenito"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Legend of operators"
-msgstr ""
+msgstr "Legenda operatora"
 
 #. module: account_report
 #: wizard_button:print.indicators,init,end:0
 #: wizard_button:print.indicators,next,end:0
 #: wizard_button:print.indicators.pdf,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: account_report
 #: field:account.report.report,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Potomci"
 
 #. module: account_report
 #: 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_report
 #: help:account.report.report,goodness_limit:0
 msgid "This Value sets the limit of goodness."
-msgstr ""
+msgstr "Ova vrijednost postavlja limit za dobro."
 
 #. module: account_report
 #: model:ir.actions.wizard,name:account_report.wizard_print_indicators
@@ -362,7 +366,7 @@ msgstr ""
 #: wizard_view:print.indicators,init:0
 #: wizard_view:print.indicators,next:0
 msgid "Print Indicators"
-msgstr ""
+msgstr "Ispis indikatora"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -373,12 +377,12 @@ msgstr ""
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Printing date:"
-msgstr ""
+msgstr "Datum ispisa:"
 
 #. module: account_report
 #: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
 msgid "Indicators in PDF"
-msgstr ""
+msgstr "Indikatori u PDF-u"
 
 #. module: account_report
 #: rml:accounting.report:0
@@ -389,18 +393,18 @@ msgstr ""
 #. module: account_report
 #: rml:accounting.report:0
 msgid "Accounting Report"
-msgstr ""
+msgstr "Računovodstveni izvještaj"
 
 #. module: account_report
 #: field:account.report.report,goodness_limit:0
 msgid "Goodness Indicator Limit"
-msgstr ""
+msgstr "Limit indikatora dobroga"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
 msgid "Other reports"
-msgstr ""
+msgstr "Ostali izvještaji"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -408,6 +412,8 @@ msgid ""
 "Note: The second arguement 'fiscalyear' and 'period' are optional "
 "arguements.If the value is -1,previous fiscalyear or period is considered."
 msgstr ""
+"Napomena: Drugi argumenti 'fiscalyear' i 'period' su opcionalni. Ako je "
+"vrijdnost -1, uzima se prethodna fiskalna gofina odn. period."
 
 #. module: account_report
 #: rml:print.indicators:0
@@ -418,41 +424,41 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_fiscal
 msgid "Fiscal Statements reporting"
-msgstr ""
+msgstr "Izještavanje fiskalnim izvodima"
 
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based on Fiscal Periods"
-msgstr ""
+msgstr "Bazirano na fiskalnim periodima"
 
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_print_indicators
 #: rml:print.indicators:0
 msgid "Indicators"
-msgstr ""
+msgstr "Indikatori"
 
 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
 msgid "Print Indicators with PDF"
-msgstr ""
+msgstr "Ipis indikatora u PDF"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_indicator
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_indicator
 msgid "Indicators reporting"
-msgstr ""
+msgstr "Izvještavanje indikatora"
 
 #. module: account_report
 #: field:account.report.report,name:0
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: account_report
 #: wizard_field:print.indicators,next,base_selection:0
 msgid "Select Criteria"
-msgstr ""
+msgstr "Odaberite kriterij"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -462,7 +468,7 @@ msgstr ""
 #. module: account_report
 #: field:account.report.history,fiscalyear_id:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Fisklana godina"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree
@@ -470,22 +476,22 @@ msgstr ""
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_define
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view
 msgid "Custom reporting"
-msgstr ""
+msgstr "Prilagođeno izvještavanje"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Page"
-msgstr ""
+msgstr "Stranica"
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "View"
-msgstr ""
+msgstr "Prikaz"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Indicators -"
-msgstr ""
+msgstr "Indikatori -"
 
 #. module: account_report
 #: help:account.report.report,disp_graph:0
@@ -493,26 +499,28 @@ msgid ""
 "If the field is set to True, information will be printed as a Graph, "
 "otherwise as an array."
 msgstr ""
+"Ukoliko je ovo polje postavljeno, informacija će biti ispisana kao grafikon. "
+"U suprotnom, biti će ispisana kao niz."
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Return value for status"
-msgstr ""
+msgstr "Povratna vrijednost statusa"
 
 #. module: account_report
 #: field:account.report.report,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
 
 #. module: account_report
 #: rml:accounting.report:0
 msgid "Amount"
-msgstr ""
+msgstr "Iznos"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr ""
+msgstr "1cm 27.7cm 20cm 27.7cm"
 
 #. module: account_report
 #: model:ir.module.module,description:account_report.module_meta_information
@@ -522,8 +530,12 @@ msgid ""
 "    Indicators\n"
 "    "
 msgstr ""
+"Finansijsko i računovodstveno izvještavanje\n"
+"    Fiskalni izvodi\n"
+"    Indikator\n"
+"    "
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "Fiscal Statement"
-msgstr ""
+msgstr "Fiskalni izvod"
diff --git a/addons/account_report/i18n/pt_BR.po b/addons/account_report/i18n/pt_BR.po
index df3898bce2c..20abfd409fe 100644
--- a/addons/account_report/i18n/pt_BR.po
+++ b/addons/account_report/i18n/pt_BR.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2009-09-08 13:40+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"PO-Revision-Date: 2010-07-28 13:15+0000\n"
+"Last-Translator: Leandro Chaves <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-06-22 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
@@ -21,166 +21,166 @@ msgstr ""
 #: selection:account.report.report,type:0
 #: model:ir.model,name:account_report.model_account_report_history
 msgid "Indicator"
-msgstr ""
+msgstr "Indicador"
 
 #. module: account_report
 #: wizard_field:print.indicators.pdf,init,file:0
 msgid "Select a PDF File"
-msgstr ""
+msgstr "Selecionar um Arquivo PDF"
 
 #. module: account_report
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Operators:"
-msgstr ""
+msgstr "Operadores"
 
 #. module: account_report
 #: field:account.report.report,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Conta-pai"
 
 #. module: account_report
 #: field:account.report.report,disp_graph:0
 msgid "Display As Graph"
-msgstr ""
+msgstr "Mostrar como Gráfico"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Debit:"
-msgstr ""
+msgstr "Débito Conta:"
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "Others"
-msgstr ""
+msgstr "Outros"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "balance(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
+msgstr "saldo(['ACCOUNT_CODE',],fiscalyear)"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Tabular Summary"
-msgstr ""
+msgstr "Resumo Tabular"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "= Goodness Indicator Limit:"
-msgstr ""
+msgstr "= Limite do Indicador de Melhora"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Very bad"
-msgstr ""
+msgstr "Muito mal"
 
 #. module: account_report
 #: field:account.report.history,val:0
 #: field:account.report.report,amount:0
 msgid "Value"
-msgstr ""
+msgstr "Valor"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "= Badness Indicator Limit:"
-msgstr ""
+msgstr "= Limite do Indicador de Piora"
 
 #. module: account_report
 #: view:account.report.report:0
 #: selection:account.report.report,status:0
 msgid "Bad"
-msgstr ""
+msgstr "Mal"
 
 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
 msgid "Select the PDF file on which Indicators will be printed."
-msgstr ""
+msgstr "Selecione o arquivo PDF no qual serão impressos os Indicadores"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "> Goodness Indicator Limit:"
-msgstr ""
+msgstr "> Limite do Indicador de Melhora:"
 
 #. module: account_report
 #: field:account.report.report,badness_limit:0
 msgid "Badness Indicator Limit"
-msgstr ""
+msgstr "Limite do Indicador de Piora"
 
 #. module: account_report
 #: selection:account.report.report,status:0
 msgid "Very Bad"
-msgstr ""
+msgstr "Muito Mal"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
 msgid "Indicator history"
-msgstr ""
+msgstr "Histórico do indicador"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "credit(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
+msgstr "crédito(['ACCOUNT_CODE',],fiscalyear)"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Report Amount:"
-msgstr ""
+msgstr "Valor do Relatório"
 
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.fiscal_statements
 msgid "Fiscal Statements"
-msgstr ""
+msgstr "Demonstrativos Fiscais"
 
 #. module: account_report
 #: wizard_button:print.indicators,init,next:0
 msgid "Next"
-msgstr ""
+msgstr "Próximo"
 
 #. module: account_report
 #: model:ir.module.module,shortdesc:account_report.module_meta_information
 msgid "Reporting for accounting"
-msgstr ""
+msgstr "Relatórios para contabilização"
 
 #. module: account_report
 #: wizard_button:print.indicators,next,print:0
 #: wizard_button:print.indicators.pdf,init,print:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: account_report
 #: field:account.report.report,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
 msgid "Print Indicators in PDF"
-msgstr ""
+msgstr "Imprimir Indicadores em PDF"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Tax Code:"
-msgstr ""
+msgstr "Código Contábil do Imposto"
 
 #. module: account_report
 #: view:account.report.report:0
 #: selection:account.report.report,status:0
 msgid "Good"
-msgstr ""
+msgstr "Bom"
 
 #. module: account_report
 #: view:account.report.history:0
 msgid "Account Report History"
-msgstr ""
+msgstr "Histórico do Relatório de Conta"
 
 #. module: account_report
 #: constraint:ir.ui.view:0
@@ -190,54 +190,54 @@ msgstr "Invalido XML para Arquitetura da View"
 #. module: account_report
 #: help:account.report.report,badness_limit:0
 msgid "This Value sets the limit of badness."
-msgstr ""
+msgstr "Este Valor define o limite de piora."
 
 #. module: account_report
 #: wizard_field:print.indicators,init,select_base:0
 msgid "Choose Criteria"
-msgstr ""
+msgstr "Escolha o critério"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "debit(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
+msgstr "débito(['ACCOUNT_CODE',],fiscalyear)"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Credit:"
-msgstr ""
+msgstr "Crédito Conta:"
 
 #. module: account_report
 #: wizard_view:print.indicators,init:0
 msgid "Select the criteria based on which Indicators will be printed."
-msgstr ""
+msgstr "Selecione o critério em função de quais Indicadores serão impressos."
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "< Badness Indicator Limit:"
-msgstr ""
+msgstr "< Limite do Indicador de Piora"
 
 #. module: account_report
 #: view:account.report.report:0
 #: selection:account.report.report,status:0
 msgid "Very Good"
-msgstr ""
+msgstr "Muito Bom"
 
 #. module: account_report
 #: field:account.report.report,note:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: account_report
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Currency:"
-msgstr ""
+msgstr "Moeda:"
 
 #. module: account_report
 #: field:account.report.report,status:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: account_report
 #: help:account.report.report,disp_tree:0
@@ -245,105 +245,108 @@ msgid ""
 "When the indicators are printed, if one indicator is set with this field to "
 "True, then it will display one more graphs with all its children in tree"
 msgstr ""
+"Quando os indicadores são impressos, se um deles estiver marcado nesse campo "
+"como Verdadeiro, então irá mostrar um ou mais gráficos com todas as contas-"
+"filhas em árvore"
 
 #. module: account_report
 #: selection:account.report.report,status:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Example: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
-msgstr ""
+msgstr "Exemplo: (saldo(['6','45'],-1) - crédito(['7'])) / relatório('RPT1')"
 
 #. module: account_report
 #: field:account.report.report,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: account_report
 #: field:account.report.report,disp_tree:0
 msgid "Display Tree"
-msgstr ""
+msgstr "Mostrar Árvore"
 
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based On Fiscal Years"
-msgstr ""
+msgstr "Com Base em Anos Fiscais"
 
 #. module: account_report
 #: model:ir.model,name:account_report.model_account_report_report
 msgid "Account reporting"
-msgstr ""
+msgstr "Relatório de conta"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Balance:"
-msgstr ""
+msgstr "Saldo de Conta"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Expression :"
-msgstr ""
+msgstr "Expressão :"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "report('REPORT_CODE')"
-msgstr ""
+msgstr "relatório('REPORT_CODE')"
 
 #. module: account_report
 #: field:account.report.report,expression:0
 msgid "Expression"
-msgstr ""
+msgstr "Expressão"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Accounting reporting"
-msgstr ""
+msgstr "Relatório contábil"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_form
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_form
 msgid "New Reporting Item Formula"
-msgstr ""
+msgstr "Fórmula  para Item Novo de Relatório"
 
 #. module: account_report
 #: field:account.report.report,code:0
 #: rml:accounting.report:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: account_report
 #: field:account.report.history,tmp:0
 msgid "temp"
-msgstr ""
+msgstr "temporário"
 
 #. module: account_report
 #: field:account.report.history,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Período"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "General"
-msgstr ""
+msgstr "Geral"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Legend of operators"
-msgstr ""
+msgstr "Legenda dos operadores"
 
 #. module: account_report
 #: wizard_button:print.indicators,init,end:0
 #: wizard_button:print.indicators,next,end:0
 #: wizard_button:print.indicators.pdf,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: account_report
 #: field:account.report.report,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Filhas (contas-filhas)"
 
 #. module: account_report
 #: constraint:ir.model:0
@@ -356,7 +359,7 @@ msgstr ""
 #. module: account_report
 #: help:account.report.report,goodness_limit:0
 msgid "This Value sets the limit of goodness."
-msgstr ""
+msgstr "Este valor definie o limite de melhora."
 
 #. module: account_report
 #: model:ir.actions.wizard,name:account_report.wizard_print_indicators
@@ -364,45 +367,45 @@ msgstr ""
 #: wizard_view:print.indicators,init:0
 #: wizard_view:print.indicators,next:0
 msgid "Print Indicators"
-msgstr ""
+msgstr "Imprimir Indicadores"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "+ - * / ( )"
-msgstr ""
+msgstr "+ - * / ( )"
 
 #. module: account_report
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Printing date:"
-msgstr ""
+msgstr "Data de impressão:"
 
 #. module: account_report
 #: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
 msgid "Indicators in PDF"
-msgstr ""
+msgstr "indicadores em PDF"
 
 #. module: account_report
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "at"
-msgstr ""
+msgstr "em"
 
 #. module: account_report
 #: rml:accounting.report:0
 msgid "Accounting Report"
-msgstr ""
+msgstr "Relatório Contábil"
 
 #. module: account_report
 #: field:account.report.report,goodness_limit:0
 msgid "Goodness Indicator Limit"
-msgstr ""
+msgstr "Limite do Indicador de Melhora"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
 msgid "Other reports"
-msgstr ""
+msgstr "Outros relatórios"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -410,61 +413,63 @@ msgid ""
 "Note: The second arguement 'fiscalyear' and 'period' are optional "
 "arguements.If the value is -1,previous fiscalyear or period is considered."
 msgstr ""
+"Nota: O segundo argumento 'ano fiscal' e 'período' são opcionais. Se o valor "
+"for -1 o \"ano fiscal' e 'período' considerados serão os anteriores."
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_fiscal
 msgid "Fiscal Statements reporting"
-msgstr ""
+msgstr "Relatório de Demonstrativos Fiscais"
 
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based on Fiscal Periods"
-msgstr ""
+msgstr "Com base nos Períodos Fiscais"
 
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_print_indicators
 #: rml:print.indicators:0
 msgid "Indicators"
-msgstr ""
+msgstr "Indicadores"
 
 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
 msgid "Print Indicators with PDF"
-msgstr ""
+msgstr "Imprimir Indicadores em PDF"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_indicator
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_indicator
 msgid "Indicators reporting"
-msgstr ""
+msgstr "Relatório de Indicadores"
 
 #. module: account_report
 #: field:account.report.report,name:0
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: account_report
 #: wizard_field:print.indicators,next,base_selection:0
 msgid "Select Criteria"
-msgstr ""
+msgstr "Selecione o Critério"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "tax_code(['ACCOUNT_TAX_CODE',],period)"
-msgstr ""
+msgstr "tax_code(['ACCOUNT_TAX_CODE',],period)"
 
 #. module: account_report
 #: field:account.report.history,fiscalyear_id:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Ano fiscal"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree
@@ -472,22 +477,22 @@ msgstr ""
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_define
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view
 msgid "Custom reporting"
-msgstr ""
+msgstr "Relatórios personalizados"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Page"
-msgstr ""
+msgstr "Página"
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "View"
-msgstr ""
+msgstr "Ver"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Indicators -"
-msgstr ""
+msgstr "Indicadores -"
 
 #. module: account_report
 #: help:account.report.report,disp_graph:0
@@ -495,26 +500,28 @@ msgid ""
 "If the field is set to True, information will be printed as a Graph, "
 "otherwise as an array."
 msgstr ""
+"Se o campo for definido como Verdadeiro. a informação será impressa como "
+"Gráfico, caso contrário como tabela."
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Return value for status"
-msgstr ""
+msgstr "Valor retornado para Estado"
 
 #. module: account_report
 #: field:account.report.report,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sequência"
 
 #. module: account_report
 #: rml:accounting.report:0
 msgid "Amount"
-msgstr ""
+msgstr "Valor"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr ""
+msgstr "1cm 27.7cm 20cm 27.7cm"
 
 #. module: account_report
 #: model:ir.module.module,description:account_report.module_meta_information
@@ -524,8 +531,12 @@ msgid ""
 "    Indicators\n"
 "    "
 msgstr ""
+"Relatório financeiro e contábil\n"
+"    Demonstrativos fiscais\n"
+"    Indicadores\n"
+"    "
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "Fiscal Statement"
-msgstr ""
+msgstr "Demonstrativo Fiscal"
diff --git a/addons/account_report/i18n/zh_CN.po b/addons/account_report/i18n/zh_CN.po
index 2f06664bc57..962011baaef 100644
--- a/addons/account_report/i18n/zh_CN.po
+++ b/addons/account_report/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:14+0000\n"
+"PO-Revision-Date: 2010-07-13 16: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-06-22 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
@@ -31,7 +31,7 @@ msgstr "选择一个PDF文件"
 #. module: account_report
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义使用了无效的模块名。"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -61,12 +61,12 @@ msgstr "其它"
 #. module: account_report
 #: view:account.report.report:0
 msgid "balance(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
+msgstr "余额(['ACCOUNT_CODE',],fiscalyear)"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Tabular Summary"
-msgstr "一览表"
+msgstr "表格摘要"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -128,7 +128,7 @@ msgstr "指标过去的记录"
 #. module: account_report
 #: view:account.report.report:0
 msgid "credit(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
+msgstr "贷方(['ACCOUNT_CODE',],fiscalyear)"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -200,7 +200,7 @@ msgstr "选择标准"
 #. module: account_report
 #: view:account.report.report:0
 msgid "debit(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
+msgstr "借方(['ACCOUNT_CODE',],fiscalyear)"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -254,7 +254,7 @@ msgstr "正常"
 #. module: account_report
 #: view:account.report.report:0
 msgid "Example: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
-msgstr ""
+msgstr "例子: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
 
 #. module: account_report
 #: field:account.report.report,active:0
@@ -289,7 +289,7 @@ msgstr "表达式:"
 #. module: account_report
 #: view:account.report.report:0
 msgid "report('REPORT_CODE')"
-msgstr ""
+msgstr "报表('REPORT_CODE')"
 
 #. module: account_report
 #: field:account.report.report,expression:0
@@ -316,7 +316,7 @@ msgstr "代码"
 #. module: account_report
 #: field:account.report.history,tmp:0
 msgid "temp"
-msgstr ""
+msgstr "temp"
 
 #. module: account_report
 #: field:account.report.history,period_id:0
@@ -331,7 +331,7 @@ msgstr "普通"
 #. module: account_report
 #: view:account.report.report:0
 msgid "Legend of operators"
-msgstr "操作说明"
+msgstr "操作员说明"
 
 #. module: account_report
 #: wizard_button:print.indicators,init,end:0
@@ -349,7 +349,7 @@ msgstr "子项"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: account_report
 #: help:account.report.report,goodness_limit:0
@@ -367,7 +367,7 @@ msgstr "打印指标"
 #. module: account_report
 #: view:account.report.report:0
 msgid "+ - * / ( )"
-msgstr ""
+msgstr "+ - * / ( )"
 
 #. module: account_report
 #: rml:accounting.report:0
@@ -407,12 +407,12 @@ msgstr "其它报表"
 msgid ""
 "Note: The second arguement 'fiscalyear' and 'period' are optional "
 "arguements.If the value is -1,previous fiscalyear or period is considered."
-msgstr "备注:第二参数‘会计年度’和‘会计期间’是可选参数.如果值为-1会计年度或会计期间是以前的."
+msgstr "备注:第二参数‘会计年度’和‘会计期间’是可选参数. 如果值为-1会计年度或会计期间是以前的."
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
@@ -423,7 +423,7 @@ msgstr "财务报表"
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based on Fiscal Periods"
-msgstr "基于会计会计期间"
+msgstr "基于会计期间"
 
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_print_indicators
@@ -457,7 +457,7 @@ msgstr "选择标准"
 #. module: account_report
 #: view:account.report.report:0
 msgid "tax_code(['ACCOUNT_TAX_CODE',],period)"
-msgstr ""
+msgstr "税号(['ACCOUNT_TAX_CODE',],period)"
 
 #. module: account_report
 #: field:account.report.history,fiscalyear_id:0
@@ -512,7 +512,7 @@ msgstr "金额"
 #. module: account_report
 #: rml:print.indicators:0
 msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr ""
+msgstr "1cm 27.7cm 20cm 27.7cm"
 
 #. module: account_report
 #: model:ir.module.module,description:account_report.module_meta_information
diff --git a/addons/account_reporting/__openerp__.py b/addons/account_reporting/__openerp__.py
index b31c7fb516b..5ac93d17984 100644
--- a/addons/account_reporting/__openerp__.py
+++ b/addons/account_reporting/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Generic Modules/Accounting',
     'description': """Financial and accounting reporting
     Balance Sheet Report""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['account'],
     'init_xml': [],
     'update_xml': [
diff --git a/addons/account_reporting/i18n/bs.po b/addons/account_reporting/i18n/bs.po
index 9c9a849642e..91ce3faaffc 100644
--- a/addons/account_reporting/i18n/bs.po
+++ b/addons/account_reporting/i18n/bs.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-07 09:23+0000\n"
+"PO-Revision-Date: 2010-08-01 17:51+0000\n"
 "Last-Translator: Bojan Markovic <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-07-08 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
@@ -26,37 +26,38 @@ msgstr "šifra"
 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_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Helvetica-Bold"
-msgstr ""
+msgstr "Helvetica-Bold"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Helvetica"
-msgstr ""
+msgstr "Helvetica"
 
 #. module: account_reporting
 #: field:account.report.bs,note:0
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: account_reporting
 #: field:account.report.bs,report_type:0
 msgid "Report Type"
-msgstr ""
+msgstr "Vrsta izvještaja"
 
 #. module: account_reporting
 #: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
 #: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
 msgid "Balance Sheet Report"
-msgstr ""
+msgstr "Bilansni izvješaj"
 
 #. module: account_reporting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Neispravan naziv modela u definiciji zadatka."
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -66,27 +67,27 @@ msgstr "Courier"
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier-BoldOblique"
-msgstr ""
+msgstr "Courier-BoldOblique"
 
 #. module: account_reporting
 #: wizard_button:account.account.balancesheet.report,init,report:0
 msgid "Print BalanceSheet"
-msgstr ""
+msgstr "Ispis bilansnog izvještaja"
 
 #. module: account_reporting
 #: help:account.account.balancesheet.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Ako je prazno, sva razdoblja"
 
 #. module: account_reporting
 #: field:account.report.bs,color_font:0
 msgid "Font Color"
-msgstr ""
+msgstr "Boja slova"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects With Accounts and child of Accounts"
-msgstr ""
+msgstr "Objekti izvještaja sa kontima i podkontima"
 
 #. module: account_reporting
 #: model:ir.module.module,description:account_reporting.module_meta_information
@@ -94,6 +95,8 @@ msgid ""
 "Financial and accounting reporting\n"
 "    Balance Sheet Report"
 msgstr ""
+"Finansijsko i računovodstveno izvještavanje\n"
+"    Bilansni izvještaj"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
@@ -103,7 +106,7 @@ msgstr "Objekti izvještaja sa kontima"
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier-Oblique"
-msgstr ""
+msgstr "Courier-Oblique"
 
 #. module: account_reporting
 #: constraint:ir.ui.view:0
@@ -114,32 +117,32 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
 #: field:account.report.bs,name:0
 #: field:color.rml,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "Account reporting"
-msgstr ""
+msgstr "Računovodstveno izvještavanje"
 
 #. module: account_reporting
 #: model:ir.ui.menu,name:account_reporting.bs_report_action_form
 msgid "Balance Sheet Report Form"
-msgstr ""
+msgstr "Forma bilansnog izvještaja"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-BoldItalic"
-msgstr ""
+msgstr "Times-BoldItalic"
 
 #. module: account_reporting
 #: model:ir.model,name:account_reporting.model_account_report_bs
 msgid "Account reporting for Balance Sheet"
-msgstr ""
+msgstr "Računovodstveno izvještavanje za bilansu stanja"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -154,32 +157,32 @@ msgstr "Times-Italic"
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects Only"
-msgstr ""
+msgstr "Samo objekti izvještaja"
 
 #. module: account_reporting
 #: model:ir.model,name:account_reporting.model_color_rml
 msgid "Rml Colors"
-msgstr ""
+msgstr "Rml boje"
 
 #. module: account_reporting
 #: model:ir.module.module,shortdesc:account_reporting.module_meta_information
 msgid "Reporting of Balancesheet for accounting"
-msgstr ""
+msgstr "Bilansno izvještavanje za računovodstvo"
 
 #. module: account_reporting
 #: field:account.report.bs,code:0
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: account_reporting
 #: field:account.report.bs,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Roditelj"
 
 #. module: account_reporting
 #: field:account.report.bs,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -194,13 +197,13 @@ msgstr "Općenito"
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "Fiskalna godina"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 #: field:account.report.bs,account_id:0
 msgid "Accounts"
-msgstr ""
+msgstr "Konta"
 
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,periods:0
@@ -210,34 +213,34 @@ msgstr "Periodi"
 #. module: account_reporting
 #: field:account.report.bs,color_back:0
 msgid "Back Color"
-msgstr ""
+msgstr "Boja pozadine"
 
 #. module: account_reporting
 #: field:account.report.bs,child_id:0
 msgid "Children"
-msgstr ""
+msgstr "Potomci"
 
 #. module: account_reporting
 #: wizard_button:account.account.balancesheet.report,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-Roman"
-msgstr ""
+msgstr "Times-Roman"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Helvetica-Oblique"
-msgstr ""
+msgstr "Helvetica-Oblique"
 
 #. module: account_reporting
 #: field:account.report.bs,font_style:0
 msgid "Font"
-msgstr ""
+msgstr "Font"
 
 #. module: account_reporting
 #: wizard_view:account.account.balancesheet.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "Prilagodite izvještaj"
diff --git a/addons/account_reporting/i18n/pt_BR.po b/addons/account_reporting/i18n/pt_BR.po
index 263f0852de9..a6d59ddeac6 100644
--- a/addons/account_reporting/i18n/pt_BR.po
+++ b/addons/account_reporting/i18n/pt_BR.po
@@ -7,19 +7,19 @@ 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"
-"PO-Revision-Date: 2009-09-08 15:24+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"PO-Revision-Date: 2010-07-28 14:32+0000\n"
+"Last-Translator: Leandro Chaves <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-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
 #: field:color.rml,code:0
 msgid "code"
-msgstr ""
+msgstr "Código"
 
 #. module: account_reporting
 #: constraint:ir.model:0
@@ -32,63 +32,63 @@ msgstr ""
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Helvetica-Bold"
-msgstr ""
+msgstr "Helvetica-Bold (negrito)"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Helvetica"
-msgstr ""
+msgstr "Helvetica"
 
 #. module: account_reporting
 #: field:account.report.bs,note:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: account_reporting
 #: field:account.report.bs,report_type:0
 msgid "Report Type"
-msgstr ""
+msgstr "Tipo de Relatório"
 
 #. module: account_reporting
 #: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
 #: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
 msgid "Balance Sheet Report"
-msgstr ""
+msgstr "Balanço"
 
 #. module: account_reporting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier"
-msgstr ""
+msgstr "Courier"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier-BoldOblique"
-msgstr ""
+msgstr "Courier-BoldOblique (negrito)"
 
 #. module: account_reporting
 #: wizard_button:account.account.balancesheet.report,init,report:0
 msgid "Print BalanceSheet"
-msgstr ""
+msgstr "Imprimir Balanço"
 
 #. module: account_reporting
 #: help:account.account.balancesheet.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Todos os perídos se vazio"
 
 #. module: account_reporting
 #: field:account.report.bs,color_font:0
 msgid "Font Color"
-msgstr ""
+msgstr "Cor da Fonte"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects With Accounts and child of Accounts"
-msgstr ""
+msgstr "Objetos do Relatório com as Contas e Contas-filhas"
 
 #. module: account_reporting
 #: model:ir.module.module,description:account_reporting.module_meta_information
@@ -96,16 +96,18 @@ msgid ""
 "Financial and accounting reporting\n"
 "    Balance Sheet Report"
 msgstr ""
+"Relatório financeiro e contábil\n"
+"    Balanço"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects With Accounts"
-msgstr ""
+msgstr "Objetos do Relatório com Contas"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier-Oblique"
-msgstr ""
+msgstr "Courier-Oblique"
 
 #. module: account_reporting
 #: constraint:ir.ui.view:0
@@ -116,130 +118,130 @@ msgstr "Invalido XML para Arquitetura da View"
 #: field:account.report.bs,name:0
 #: field:color.rml,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "Account reporting"
-msgstr ""
+msgstr "Relatório de Conta"
 
 #. module: account_reporting
 #: model:ir.ui.menu,name:account_reporting.bs_report_action_form
 msgid "Balance Sheet Report Form"
-msgstr ""
+msgstr "Formulário do Balanço"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-BoldItalic"
-msgstr ""
+msgstr "Times-BoldItalic (negrito itálico)"
 
 #. module: account_reporting
 #: model:ir.model,name:account_reporting.model_account_report_bs
 msgid "Account reporting for Balance Sheet"
-msgstr ""
+msgstr "Relatório contábil para Balanço"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier-Bold"
-msgstr ""
+msgstr "Courier-Bold (negrito)"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-Italic"
-msgstr ""
+msgstr "Times-Italic (itálico)"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects Only"
-msgstr ""
+msgstr "Relatar somento os Objetos"
 
 #. module: account_reporting
 #: model:ir.model,name:account_reporting.model_color_rml
 msgid "Rml Colors"
-msgstr ""
+msgstr "Rml Colors"
 
 #. module: account_reporting
 #: model:ir.module.module,shortdesc:account_reporting.module_meta_information
 msgid "Reporting of Balancesheet for accounting"
-msgstr ""
+msgstr "Relatório do Balanço para contabilização"
 
 #. module: account_reporting
 #: field:account.report.bs,code:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: account_reporting
 #: field:account.report.bs,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Conta-pai"
 
 #. module: account_reporting
 #: field:account.report.bs,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sequência"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-Bold"
-msgstr ""
+msgstr "Times-Bold (negrito)"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "General"
-msgstr ""
+msgstr "Geral"
 
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "Ano Fiscal"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 #: field:account.report.bs,account_id:0
 msgid "Accounts"
-msgstr ""
+msgstr "Contas"
 
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,periods:0
 msgid "Periods"
-msgstr ""
+msgstr "Períodos"
 
 #. module: account_reporting
 #: field:account.report.bs,color_back:0
 msgid "Back Color"
-msgstr ""
+msgstr "Cor de Fundo"
 
 #. module: account_reporting
 #: field:account.report.bs,child_id:0
 msgid "Children"
-msgstr ""
+msgstr "Contas-filhas"
 
 #. module: account_reporting
 #: wizard_button:account.account.balancesheet.report,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-Roman"
-msgstr ""
+msgstr "Times-Roman"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Helvetica-Oblique"
-msgstr ""
+msgstr "Helvetica-Oblique"
 
 #. module: account_reporting
 #: field:account.report.bs,font_style:0
 msgid "Font"
-msgstr ""
+msgstr "Fonte"
 
 #. module: account_reporting
 #: wizard_view:account.account.balancesheet.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "Customizar Relatório (ajustes especiais)"
diff --git a/addons/account_reporting/i18n/zh_CN.po b/addons/account_reporting/i18n/zh_CN.po
index bf346e5f389..9f50d6c9769 100644
--- a/addons/account_reporting/i18n/zh_CN.po
+++ b/addons/account_reporting/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:15+0000\n"
+"PO-Revision-Date: 2010-07-13 16:33+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-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
@@ -30,12 +30,12 @@ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Helvetica-Bold"
-msgstr ""
+msgstr "Helvetica-Bold"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Helvetica"
-msgstr ""
+msgstr "Helvetica"
 
 #. module: account_reporting
 #: field:account.report.bs,note:0
@@ -56,17 +56,17 @@ msgstr "科目余额表"
 #. module: account_reporting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义使用了无效的模块名。"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier"
-msgstr ""
+msgstr "Courier"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier-BoldOblique"
-msgstr ""
+msgstr "Courier-BoldOblique"
 
 #. module: account_reporting
 #: wizard_button:account.account.balancesheet.report,init,report:0
@@ -93,7 +93,9 @@ msgstr "科目和子科目报表对象"
 msgid ""
 "Financial and accounting reporting\n"
 "    Balance Sheet Report"
-msgstr "财务和会计报表 资产负债表"
+msgstr ""
+"财务和会计报表 \n"
+"资产负债表"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
@@ -103,7 +105,7 @@ msgstr "科目报表对象"
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier-Oblique"
-msgstr ""
+msgstr "Courier-Oblique"
 
 #. module: account_reporting
 #: constraint:ir.ui.view:0
@@ -134,7 +136,7 @@ msgstr "备注"
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-BoldItalic"
-msgstr ""
+msgstr "Times-BoldItalic"
 
 #. module: account_reporting
 #: model:ir.model,name:account_reporting.model_account_report_bs
@@ -144,12 +146,12 @@ msgstr "会计报表资产负债表"
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier-Bold"
-msgstr ""
+msgstr "Courier-Bold"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-Italic"
-msgstr ""
+msgstr "Times-Italic"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
@@ -184,7 +186,7 @@ msgstr "序列"
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-Bold"
-msgstr ""
+msgstr "Times-Bold"
 
 #. module: account_reporting
 #: view:account.report.bs:0
@@ -225,12 +227,12 @@ msgstr "取消"
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-Roman"
-msgstr ""
+msgstr "Times-Roman"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Helvetica-Oblique"
-msgstr ""
+msgstr "Helvetica-Oblique"
 
 #. module: account_reporting
 #: field:account.report.bs,font_style:0
diff --git a/addons/account_tax_include/__openerp__.py b/addons/account_tax_include/__openerp__.py
index 0981da4888e..f1e6c3dfb74 100644
--- a/addons/account_tax_include/__openerp__.py
+++ b/addons/account_tax_include/__openerp__.py
@@ -29,7 +29,7 @@ Especially useful for b2c businesses.
 
 This module implement the modification on the invoice form.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
diff --git a/addons/account_tax_include/i18n/zh_CN.po b/addons/account_tax_include/i18n/zh_CN.po
index b154a5dbb56..da1e07f44ac 100644
--- a/addons/account_tax_include/i18n/zh_CN.po
+++ b/addons/account_tax_include/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:29+0000\n"
+"PO-Revision-Date: 2010-07-13 16:34+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-06-22 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构XML文件!"
+msgstr "无效XML视图结构!"
 
 #. module: account_tax_include
 #: field:account.invoice,price_type:0
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index aa2dd4cecd4..6fef206aa8d 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Accounting Voucher Entries",
     "version" : "1.0",
-    "author" : 'Tiny & Axelor',
+    "author" : 'OpenERP SA & Axelor',
     "description": """Account Voucher module includes all the basic requirements of
     Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc...
     * Voucher Entry
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index b31cfb9d4ca..37bfbcda4d8 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:30+0000\n"
+"PO-Revision-Date: 2010-07-14 03:20+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-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1
 msgid "Opening Balance Entry"
-msgstr "期初余额凭证"
+msgstr "期初余额"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list
@@ -41,7 +41,7 @@ msgstr "状态:"
 #. module: account_voucher
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义使用了无效的模块名。"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
@@ -69,12 +69,12 @@ msgstr "公司"
 #: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form
 msgid "Journal Voucher"
-msgstr "原始凭证分类帐"
+msgstr "原始凭证"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt.drcr:0
 msgid ","
-msgstr ""
+msgstr ","
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -105,7 +105,7 @@ msgstr "科目"
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 msgid "D"
-msgstr ""
+msgstr "D"
 
 #. module: account_voucher
 #: field:account.account,level:0
@@ -115,7 +115,7 @@ msgstr "级"
 #. module: account_voucher
 #: view:account.move:0
 msgid "Account Entry Line"
-msgstr "凭证明细"
+msgstr "明细"
 
 #. module: account_voucher
 #: view:account.move:0
@@ -139,18 +139,18 @@ msgstr "收款人签字"
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "No."
-msgstr ""
+msgstr "No."
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Amount (in words) :"
-msgstr "金额:"
+msgstr "金额(口头上):"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -159,7 +159,7 @@ msgstr "辅助核算项目"
 #: model:ir.actions.act_window,name:account_voucher.action_view_jour_sale_voucher_form
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_sale_voucher_form
 msgid "Journal Sale Voucher"
-msgstr "销售原始凭证分类帐"
+msgstr "销售原始凭证"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_receipt_vou_voucher_list
@@ -346,12 +346,12 @@ msgstr "新的现金付款"
 #. module: account_voucher
 #: view:account.move:0
 msgid "Optional Information"
-msgstr "其它信息"
+msgstr "可选择信息"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "General Entries"
-msgstr "一般凭证"
+msgstr "一般记录"
 
 #. module: account_voucher
 #: field:account.voucher,date:0
@@ -362,7 +362,7 @@ msgstr "日期"
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid ":"
-msgstr ""
+msgstr "："
 
 #. module: account_voucher
 #: field:account.account,type1:0
@@ -476,7 +476,7 @@ msgstr "说明"
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Canceled"
-msgstr "取消"
+msgstr "已取消"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -497,7 +497,7 @@ msgstr "银行收入"
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -506,12 +506,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_jour_pur_voucher_form
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_pur_voucher_form
 msgid "Journal Purchase Voucher"
-msgstr "采购原始凭证分类帐"
+msgstr "采购原始凭证"
 
 #. module: account_voucher
 #: view:account.account:0
 msgid "Closing Balance"
-msgstr "期末结余"
+msgstr "期末余额"
 
 #. module: account_voucher
 #: field:account.voucher.line,ref:0
@@ -524,7 +524,7 @@ msgstr "参考"
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Posted"
-msgstr "已审核"
+msgstr "已登帐"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
@@ -534,22 +534,22 @@ msgstr "名称"
 #. module: account_voucher
 #: field:account.voucher,move_ids:0
 msgid "Real Entry"
-msgstr "实际凭证"
+msgstr "实际记录"
 
 #. module: account_voucher
 #: model:ir.actions.wizard,name:account_voucher.wizard_account_voucher_open
 msgid "Open a Voucher Entry"
-msgstr "打开一原始凭证记录"
+msgstr "打开一原始凭证"
 
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
-msgstr "凭证"
+msgstr "分录"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Entry Lines"
-msgstr "凭证明细"
+msgstr "明细"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form
@@ -595,4 +595,4 @@ msgstr "银行收入原始凭证"
 #: field:account.account,journal_id:0
 #: field:account.voucher,journal_id:0
 msgid "Journal"
-msgstr "分类帐"
+msgstr "记录集合"
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 47ff58a3226..22e06a25f3a 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -22,6 +22,7 @@
 import time
 from osv import fields
 from osv import osv
+from tools.translate import _
 
 journal2type = {
     'cash':'rec_voucher',
@@ -111,17 +112,16 @@ class account_voucher(osv.osv):
             ('bank_pay_voucher','Bank Payment'),
             ('rec_voucher','Cash Receipt'),
             ('bank_rec_voucher','Bank Receipt'),
-#            ('cont_voucher','Contra'),
             ('journal_sale_vou','Journal Sale'),
             ('journal_pur_voucher','Journal Purchase'),
             ('journal_voucher','Journal Voucher'),
             ],'Entry Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}),
-        'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}),
+        'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
-        'payment_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=False, states={'proforma':[('readonly',True)]}),
-        'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'posted':[('readonly',True)]}),
-        'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}, required=False),
+        'payment_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
+        'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'posted':[('readonly',False)]}),
+        'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'state':fields.selection(
@@ -137,9 +137,8 @@ class account_voucher(osv.osv):
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
                         \n* The \'Cancelled\' state is used when user cancel voucher.'),
         'amount':fields.float('Amount', readonly=True),
-        'reference': fields.char('Voucher Reference', size=64),
-        'reference_type': fields.selection(_get_reference_type, 'Reference Type',
-            required=True),
+        'reference': fields.char('Reference', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Bank cheque number or payorder number"),
+        'reference_type': fields.selection(_get_reference_type, 'Reference Type', required=True),
         'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
         'move_id':fields.many2one('account.move', 'Account Entry'),
         'move_ids':fields.many2many('account.move.line', 'voucher_id', 'account_id', 'rel_account_move', 'Real Entry'),
@@ -204,7 +203,7 @@ class account_voucher(osv.osv):
             }
             self.write(cr, uid, ids, res)
         else:
-            raise osv.except_osv('Invalid action !', 'You cannot post to Pro-Forma a voucher with Total amount = 0 !')
+            raise osv.except_osv(_('Invalid action !'), _('You can not post to Pro-Forma a voucher with Total amount = 0 !'))
         return True
 
     def proforma_voucher(self, cr, uid, ids, context={}):
@@ -262,25 +261,41 @@ class account_voucher(osv.osv):
         move_line_pool = self.pool.get('account.move.line')
         analytic_pool = self.pool.get('account.analytic.line')
         currency_pool = self.pool.get('res.currency')
+        invoice_pool = self.pool.get('account.invoice')
         
         for inv in self.browse(cr, uid, ids):
-
+            
             if inv.move_id:
                 continue
+
+            journal = journal_pool.browse(cr, uid, inv.journal_id.id)
+            if inv.type in ('journal_pur_voucher', 'journal_sale_vou'):
+                if journal.invoice_sequence_id:
+                    name = sequence_pool.get_id(cr, uid, journal.invoice_sequence_id.id)
+                else:
+                    raise osv.except_osv(_('Error !'), _('Please define invoice sequence on %s journal !' % (journal.name)))
+            else:
+                if journal.sequence_id:
+                    name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
+                else:
+                    raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
+            
+            ref = False
+            if inv.type in ('journal_pur_voucher', 'bank_rec_voucher', 'rec_voucher'):
+                ref = inv.reference
+            else:
+                ref = invoice_pool._convert_ref(cr, uid, name)
             
             company_currency = inv.company_id.currency_id.id
             diff_currency_p = inv.currency_id.id <> company_currency
             
-            journal = journal_pool.browse(cr, uid, inv.journal_id.id)
-            if journal.sequence_id:
-                name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
-            
             move = {
-                'name' : name,
-                'journal_id': journal.id,
-                'type' : inv.type,
-                'narration' : inv.narration and inv.narration or inv.name,
-                'date':inv.date
+                'name':name,
+                'journal_id':journal.id,
+                'type':inv.type,
+                'narration':inv.narration and inv.narration or inv.name,
+                'date':inv.date,
+                'ref':ref
             }
             
             if inv.period_id:
@@ -300,7 +315,7 @@ class account_voucher(osv.osv):
                 'journal_id': inv.journal_id.id,
                 'period_id': inv.period_id.id,
                 'partner_id': False,
-                'ref': inv.reference,
+                'ref':ref,
                 'date': inv.date
             }
             if diff_currency_p:
@@ -320,18 +335,22 @@ class account_voucher(osv.osv):
             line_ids += [move_line_pool.create(cr, uid, move_line)]
             for line in inv.payment_ids:
                 amount=0.0
+                
+                if inv.type in ('bank_pay_voucher', 'pay_voucher', 'journal_voucher'):
+                    ref = line.ref
+                    
                 move_line = {
-                     'name': line.name,
-                     'debit': False,
-                     'credit': False,
-                     'account_id': line.account_id.id or False,
-                     'move_id': move_id ,
-                     'journal_id': inv.journal_id.id,
-                     'period_id': inv.period_id.id,
-                     'partner_id': line.partner_id.id or False,
-                     'ref': line.ref,
-                     'date': inv.date,
-                     'analytic_account_id': False
+                     'name':line.name,
+                     'debit':False,
+                     'credit':False,
+                     'account_id':line.account_id.id or False,
+                     'move_id':move_id ,
+                     'journal_id':inv.journal_id.id,
+                     'period_id':inv.period_id.id,
+                     'partner_id':line.partner_id.id or False,
+                     'ref':ref,
+                     'date':inv.date,
+                     'analytic_account_id':False
                 }
                 
                 if diff_currency_p:
@@ -366,6 +385,10 @@ class account_voucher(osv.osv):
                 'move_id': move_id,
                 'move_ids':[(6, 0,line_ids)]
             }
+            
+            message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirmed")
+            self.log(cr, uid, inv.id, message)
+            
             self.write(cr, uid, [inv.id], rec)
             
         return True
@@ -395,9 +418,9 @@ class account_voucher(osv.osv):
             context={}
         ids = []
         if name:
-            ids = self.search(cr, user, [('number','=',name)]+ args, limit=limit, context=context)
+            ids = self.search(cr, user, [('number','=',name)]+args, limit=limit, context=context)
         if not ids:
-            ids = self.search(cr, user, [('name',operator,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)
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -447,25 +470,24 @@ class account_voucher_line(osv.osv):
         account_id = False
 
         partner = partner_pool.browse(cr, uid, partner_id)
+        balance = 0.0
         
-        if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'):
+        if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'):
             account_id = partner.property_account_receivable.id
             balance = partner.credit
             ttype = 'cr'
             
-        elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') :
+        elif type1 in ('pay_voucher', 'bank_pay_voucher', 'journal_voucher') :
             account_id = partner.property_account_payable.id
             balance = partner.debit
             ttype = 'dr'
             
         elif type1 in ('journal_sale_vou') :
             account_id = partner.property_account_receivable.id
-            balance = partner.credit
             ttype = 'dr'
             
         elif type1 in ('journal_pur_voucher') :
             account_id = partner.property_account_payable.id
-            balance = partner.debit
             ttype = 'cr'
         
         if company.currency_id != currency:
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 1a781c4cc34..de708c671e0 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -6,9 +6,10 @@
             <field name="model">account.voucher</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Accounting Vouchers">
+                <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open','proforma','posted','recheck','audit')" string="Voucher Entries">
                     <field name="date"/>
                     <field name="number"/>
+                    <field name="reference"/>
                     <field name="name"/>
                     <field name="journal_id"/>
                     <field name="type" invisible=" not context.get('set_visible',True)"/>
@@ -34,8 +35,8 @@
                         <field name="type" on_change="onchange_journal(journal_id,type)"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Journal Entries">
-                            <field name="payment_ids" colspan="4" nolabel="1" height="250">
+                        <page string="Voucher Entry">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="200">
                                 <tree string="Voucher Lines" editable="top">
                                     <field name="partner_id" on_change="onchange_partner(partner_id,type,parent.type, parent.currency_id)"/>
                                     <field name="account_id"/>
@@ -46,14 +47,20 @@
                                     <field name="ref"/>
                                 </tree>
                             </field>
-                            <separator string="Narration" colspan="4"/>
-                            <field name="narration" colspan="4" nolabel="1" height="50"/>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Other Informtion" colspan="2"/>
+                                <field name="reference" select="1"/>
+                                <field name="date" select="1"/>
+                                <field name="currency_id" select="1"/>
+                            </group>
                         </page>
-                        <page string="Other Info">
+                        <page string="Accounting Entries">
                             <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
-                            <field name="currency_id" select="1" />
                             <field name="period_id"/>
-                            <field name="date" select="1"/>
                             <separator string="General Entries" colspan="4"/>
                             <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
                         </page>
@@ -62,7 +69,7 @@
                         <field name="state"/>
                         <button name="open_voucher" string="Pro-forma" states="draft" icon="terp-check"/>
                         <button name="proforma_voucher" string="Create" states="proforma" icon="terp-document-new"/>
-                        <button name="recheck_voucher" string="Validate" states="recheck" icon="terp-check"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
                         <button name="audit_complete" string="Audit Pass" states="posted" icon="terp-check"/>
                         <button name="cancel_voucher" string="Cancel" states="proforma,recheck,posted"  icon="gtk-cancel"/>
                         <button name="cancel_to_draft" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
@@ -81,12 +88,18 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                        <filter icon="terp-gtk-stop" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers"/>
                         <separator orientation="vertical"/>
-                        <field name="date" select='1'/>
-                        <field name="name" select='1'/>
+                        <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
+                        <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
+                        <separator orientation="vertical"/>
+                        <field name="reference" select="1"/>
                         <field name="number" select='1'/>
+                        <field name="name" select='1'/>
+                        <field name="account_id" select="1"/>
                         <field name="partner_id" select='1'/>
+                        <newline/>
+                        <field name="narration" select="1"/>
+                        <field name="date" select='1'/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
@@ -97,9 +110,8 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Extended options...">
-                       <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
-                       <field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/>
-                       <field name="type" context="{'type': self}" />
+                        <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
+                        <field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/>                        
                    </group>
                 </search>
             </field>
@@ -114,12 +126,23 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                        <filter icon="terp-gtk-stop" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers"/>
                         <separator orientation="vertical"/>
-                        <field name="date" select='1'/>
-                        <field name="name" select='1'/>
+                        <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
+                        <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
+                        <separator orientation="vertical"/>
+                        <field name="reference" select="1"/>
                         <field name="number" select='1'/>
+                        <field name="name" select='1'/>
+                        <field name="account_id" select="1"/>
                         <field name="partner_id" select='1'/>
+                        <newline/>
+                        <field name="narration" select="1"/>
+                        <field name="date" select='1'/>
+                    </group>
+                    <newline/>
+                    <group col='8' colspan='4'>
+                        <field name="journal_id" widget="selection" select="1"/>
+                        <field name="period_id" widget="selection" select="1"/>                        
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
@@ -132,12 +155,24 @@
             </field>
         </record>
 
+        <record id="account_cash_statement_graph" model="ir.ui.view">
+            <field name="name">account.voucher.graph</field>
+            <field name="model">account.voucher</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Voucher Statistics" type="bar">
+                    <field name="date"/>
+                    <field name="amount" operator="+"/>
+                </graph>
+            </field>
+         </record>
+        
         <!--  Receipt Vouchers -->
         <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
             <field name="name">Receivable Vouchers</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" eval="view_voucher_tree"/>
             <field name="domain">[('journal_id.type','=','sale')]</field>
             <field name="context">{'type':'sale'}</field>
@@ -151,7 +186,7 @@
             <field name="name">Payable Vouchers</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" eval="view_voucher_tree"/>
             <field name="domain">[('journal_id.type','=','purchase')]</field>
             <field name="context">{'type':'purchase'}</field>
@@ -165,7 +200,7 @@
             <field name="name">Journal Vouchers</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="context">{'type':'general'}</field>
             <field name="view_id" eval="view_voucher_tree"/>
             <field name="search_view_id" ref="view_voucher_filter"/>
@@ -217,10 +252,10 @@
             <field name="search_view_id" ref="view_voucher_filter_new"/>
         </record>
 
-        <menuitem 
-            id="menu_action_review_voucher_list"
-            action="action_review_voucher_list" 
-            parent="account.periodical_processing_journal_entries_validation" sequence="2"/>
-        
+<!--        <menuitem -->
+<!--            id="menu_action_review_voucher_list"-->
+<!--            action="action_review_voucher_list" -->
+<!--            parent="account.periodical_processing_journal_entries_validation" sequence="2"/>-->
+<!--        -->
         </data>
 </openerp>
diff --git a/addons/account_voucher_payment/__openerp__.py b/addons/account_voucher_payment/__openerp__.py
index fc4ce593eac..a48d95bda16 100755
--- a/addons/account_voucher_payment/__openerp__.py
+++ b/addons/account_voucher_payment/__openerp__.py
@@ -21,7 +21,7 @@
 {
     "name" : "Invoice Payment/Receipt by Vouchers.",
     "version" : "1.0",
-    "author" : 'Tiny & Axelor',
+    "author" : 'OpenERP SA & Axelor',
     "description": """Extension Account Voucher module includes allows to link payment / receipt 
     entries with voucher, also automatically reconcile during the payment and receipt entries
     """,
diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py
index f2c6507181c..8c4e3984da4 100755
--- a/addons/account_voucher_payment/account_voucher_payment.py
+++ b/addons/account_voucher_payment/account_voucher_payment.py
@@ -22,6 +22,39 @@
 from osv import fields, osv
 from tools.translate import _
 
+class account_invoice(osv.osv):
+    _inherit = 'account.invoice'
+
+    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        """
+        Returns a list of ids based on search domain {args}
+    
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param args: list of conditions to be applied in search opertion
+        @param offset: default from first record, you can start from nth record
+        @param limit: number of records to be obtained as a result of search opertion
+        @param order: ordering on any field(s)
+        @param context: context arguments, like lang, time zone
+        @param count: 
+        
+        @return: Returns a list of ids based on search domain
+        """
+        if not context:
+            context = {}
+        ttype = context.get('ttype', False)
+        if ttype and ttype in ('rec_voucher', 'bank_rec_voucher'):
+            args += [('type','in', ['out_invoice', 'in_refund'])]
+        elif ttype and ttype in ('pay_voucher', 'bank_pay_voucher'):
+            args += [('type','in', ['in_invoice', 'out_refund'])]
+        elif ttype and ttype in('journal_sale_vou', 'journal_pur_voucher', 'journal_voucher'):
+            raise osv.except_osv(_('Invalid action !'), _('You can not reconcile sales, purchase, or journal voucher with invoice !'))
+            args += [('type','=', 'do_not_allow_search')]
+
+        res = super(account_invoice, self).search(cr, user, args, offset, limit, order, context, count)
+        return res
+    
+account_invoice()
 
 class account_move_line(osv.osv):
     _inherit = "account.move.line"
@@ -45,25 +78,41 @@ class account_voucher(osv.osv):
         analytic_pool = self.pool.get('account.analytic.line')
         currency_pool = self.pool.get('res.currency')
         invoice_pool = self.pool.get('account.invoice')
+        invoice_pool = self.pool.get('account.invoice')
         
         for inv in self.browse(cr, uid, ids):
-
+            
             if inv.move_id:
                 continue
             
+            journal = journal_pool.browse(cr, uid, inv.journal_id.id)
+            if inv.type in ('journal_pur_voucher', 'journal_sale_vou'):
+                if journal.invoice_sequence_id:
+                    name = sequence_pool.get_id(cr, uid, journal.invoice_sequence_id.id)
+                else:
+                    raise osv.except_osv(_('Error !'), _('Please define invoice sequence on %s journal !' % (journal.name)))
+            else:
+                if journal.sequence_id:
+                    name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
+                else:
+                    raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
+            
+            ref = False
+            if inv.type in ('journal_pur_voucher', 'bank_rec_voucher', 'rec_voucher'):
+                ref = inv.reference
+            else:
+                ref = invoice_pool._convert_ref(cr, uid, name)
+            
             company_currency = inv.company_id.currency_id.id
             diff_currency_p = inv.currency_id.id <> company_currency
 
-            journal = journal_pool.browse(cr, uid, inv.journal_id.id)
-            if journal.sequence_id:
-                name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
-            
             move = {
                 'name' : name,
                 'journal_id': journal.id,
                 'type' : inv.type,
                 'narration' : inv.narration and inv.narration or inv.name,
-                'date':inv.date
+                'date':inv.date,
+                'ref':ref
             }
             
             if inv.period_id:
@@ -75,16 +124,16 @@ class account_voucher(osv.osv):
             
             #create the first line manually
             move_line = {
-                'name': inv.name,
-                'debit': False,
+                'name':inv.name,
+                'debit':False,
                 'credit':False,
-                'account_id': inv.account_id.id or False,
-                'move_id': move_id ,
-                'journal_id': inv.journal_id.id,
-                'period_id': inv.period_id.id,
-                'partner_id': False,
-                'ref': inv.reference,
-                'date': inv.date
+                'account_id':inv.account_id.id or False,
+                'move_id':move_id ,
+                'journal_id':inv.journal_id.id,
+                'period_id':inv.period_id.id,
+                'partner_id':False,
+                'ref':ref,
+                'date':inv.date
             }
             if diff_currency_p:
                 amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
@@ -101,20 +150,26 @@ class account_voucher(osv.osv):
             
             line_ids = []
             line_ids += [move_line_pool.create(cr, uid, move_line)]
+            rec_ids = []
+            
             for line in inv.payment_ids:
                 amount=0.0
+
+                if inv.type in ('bank_pay_voucher', 'pay_voucher', 'journal_voucher'):
+                    ref = line.ref
+                
                 move_line = {
-                     'name': line.name,
-                     'debit': False,
-                     'credit': False,
-                     'account_id': line.account_id.id or False,
-                     'move_id': move_id ,
-                     'journal_id': inv.journal_id.id,
-                     'period_id': inv.period_id.id,
-                     'partner_id': line.partner_id.id or False,
-                     'ref': line.ref,
-                     'date': inv.date,
-                     'analytic_account_id': False
+                     'name':line.name,
+                     'debit':False,
+                     'credit':False,
+                     'account_id':line.account_id.id or False,
+                     'move_id':move_id ,
+                     'journal_id':inv.journal_id.id,
+                     'period_id':inv.period_id.id,
+                     'partner_id':line.partner_id.id or False,
+                     'ref':ref,
+                     'date':inv.date,
+                     'analytic_account_id':False
                 }
                 
                 if diff_currency_p:
@@ -145,17 +200,23 @@ class account_voucher(osv.osv):
                 move_line_id = move_line_pool.create(cr, uid, move_line)
                 line_ids += [move_line_id]
                 
-                if line.invoice_id:
-                    rec_ids = [move_line_id]
+                if line.invoice_id and inv.type in ('pay_voucher', 'bank_pay_voucher', 'rec_voucher', 'bank_rec_voucher'):
+                    rec_ids += [move_line_id]
                     for move_line in line.invoice_id.move_id.line_id:
                         if line.account_id.id == move_line.account_id.id:
                             rec_ids += [move_line.id]
-                    move_line_pool.reconcile_partial(cr, uid, rec_ids)
+
+            if rec_ids:
+                move_line_pool.reconcile_partial(cr, uid, rec_ids)
             
             rec = {
                 'move_id': move_id,
                 'move_ids':[(6, 0,line_ids)]
             }
+            
+            message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirm")
+            self.log(cr, uid, inv.id, message)
+            
             self.write(cr, uid, [inv.id], rec)
             
         return True        
@@ -178,7 +239,7 @@ class account_voucher_line(osv.osv):
         res = super(account_voucher_line, self).move_line_get_item(cr, uid, line, context)
         res['invoice'] = line.invoice_id or False
         return res
-
+    
     def onchange_invoice_id(self, cr, uid, ids, invoice_id, currency_id):
         currency_pool = self.pool.get('res.currency')
         invoice_pool = self.pool.get('account.invoice')
diff --git a/addons/account_voucher_payment/account_voucher_payment_view.xml b/addons/account_voucher_payment/account_voucher_payment_view.xml
index 3f118120c8a..6da4c7d45e2 100755
--- a/addons/account_voucher_payment/account_voucher_payment_view.xml
+++ b/addons/account_voucher_payment/account_voucher_payment_view.xml
@@ -10,10 +10,10 @@
                 <field name="payment_ids" position="replace">
                     <field name="voucher_line_ids"  default_get="{'lines': voucher_line_ids}" colspan="4" nolabel="1" height="275">
                         <tree string="Voucher Lines" editable="top">
-                            <field name="partner_id" on_change="onchange_partner(partner_id,type,parent.type, parent.currency_id)"/>
+                            <field name="partner_id" on_change="onchange_partner(partner_id, type, parent.type, parent.currency_id)"/>
                             <field name="account_id" on_change="onchange_line_account(account_id, type, parent.type)"/>
                             <field name="name"/>
-                            <field name="invoice_id" on_change="onchange_invoice_id(invoice_id, parent.currency_id)" domain="[('partner_id','=',partner_id),('state','=','open'),('residual','&gt;',0.0)]"/>
+                            <field name="invoice_id" context="{'ttype':parent.type}" on_change="onchange_invoice_id(invoice_id, parent.currency_id)" domain="[('partner_id','=',partner_id),('state','=','open'),('residual','&gt;',0.0)]"/>
                             <field name="type"/>
                             <field name="amount"/>
                             <field name="account_analytic_id"/>
diff --git a/addons/account_voucher_payment/i18n/pt_BR.po b/addons/account_voucher_payment/i18n/pt_BR.po
new file mode 100644
index 00000000000..0899a170f55
--- /dev/null
+++ b/addons/account_voucher_payment/i18n/pt_BR.po
@@ -0,0 +1,89 @@
+# Brazilian Portuguese 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: 2009-05-13 20:11+0000\n"
+"PO-Revision-Date: 2010-07-28 14:21+0000\n"
+"Last-Translator: Leandro Chaves <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-07-29 03:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML inválido para a arquitetura de exibição"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr "Transações não conciliadas"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_name_translation
+msgid ""
+"This module includes :\n"
+"    * It reconcile the invoice (supplier, customer) while paying through \n"
+"    Accounting Vouchers\n"
+"    "
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"Se você desfazer a reconciliação de transações, você deve também verificar "
+"todas as ações que estão ligadas a essas operações, porque elas não serão "
+"desfeitas pelo sistema"
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr "Linhas de Comprovantes"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr "Anular reconciliação de lançamentos"
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_voucher_payment
+#: field:account.voucher,partner_id:0
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr "Não concilidado"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr "Desconciliação"
diff --git a/addons/account_voucher_payment/i18n/sl.po b/addons/account_voucher_payment/i18n/sl.po
new file mode 100644
index 00000000000..ff98b869bbf
--- /dev/null
+++ b/addons/account_voucher_payment/i18n/sl.po
@@ -0,0 +1,88 @@
+# 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: 2009-05-13 20:11+0000\n"
+"PO-Revision-Date: 2010-07-28 12:23+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-07-29 03:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr "Preklic uskladitve transakcij"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_name_translation
+msgid ""
+"This module includes :\n"
+"    * It reconcile the invoice (supplier, customer) while paying through \n"
+"    Accounting Vouchers\n"
+"    "
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"Če prekličete uskladitev transakcij, morate tudi preveriti vse akcije, ki so "
+"povezane s temi transakcijami, kajti le te ne bodo onemogočene."
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr "Prekliči uskladitev vknjižb"
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: account_voucher_payment
+#: field:account.voucher,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr "Prekliči uskladitev"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr "Preklic uskladitve"
diff --git a/addons/account_voucher_payment/i18n/zh_CN.po b/addons/account_voucher_payment/i18n/zh_CN.po
new file mode 100644
index 00000000000..377a1926046
--- /dev/null
+++ b/addons/account_voucher_payment/i18n/zh_CN.po
@@ -0,0 +1,90 @@
+# 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: 2009-05-13 20:11+0000\n"
+"PO-Revision-Date: 2010-07-14 03:27+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-07-15 03:36+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "无效XML视图结构!"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr "取消对账"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_name_translation
+msgid ""
+"This module includes :\n"
+"    * It reconcile the invoice (supplier, customer) while paying through \n"
+"    Accounting Vouchers\n"
+"    "
+msgstr ""
+"这模块包括:\n"
+"    *在支付时核销发票(供应商, 客户) \n"
+"    原始凭证\n"
+"    "
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr "如果取消交易的核销, 你必须检验链接该交易的所有操作. 因为他们不会被禁止."
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr "原始凭证明细"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr "发票付款/ 收入的原始凭证"
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr "取消核销"
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr "发票"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: account_voucher_payment
+#: field:account.voucher,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr "取消核销"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr "取消对账"
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 143168ab8fe..e0411506dd8 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name" : "Analytic Account",
     "version": "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Projects & Services",
     "depends" : ["base", "decimal_precision"],
diff --git a/addons/analytic/i18n/et.po b/addons/analytic/i18n/et.po
new file mode 100644
index 00000000000..9b745ea87e3
--- /dev/null
+++ b/addons/analytic/i18n/et.po
@@ -0,0 +1,266 @@
+# Estonian 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-06-18 10:59+0000\n"
+"PO-Revision-Date: 2010-07-22 20:10+0000\n"
+"Last-Translator: lyyser <logard.1961@gmail.com>\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-07-23 04:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Alamkontod"
+
+#. module: analytic
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+
+#. 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"
+msgstr "Konto nimi"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Riik/Osariik"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Konto haldur"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Mustand"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Suletud"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Deebet"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state.                           "
+"       \n"
+"* If any associated partner is there, it can be in 'Open' state.             "
+"                     \n"
+"* If any pending balance is there it can be in 'Pending'.                    "
+"               \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project.                            "
+"     \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "Konto tüüp"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Mall"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "Ootel"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Kirjeldus"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Ettevõte"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Kasutaja"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Ülem analüütiline konto"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Kuupäev"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Vaade"
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Krediit"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Kogus"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Katkestatud"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Balanss"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Alguskuupäev"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Kvantiteet"
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Lõppkuupäev"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Konto kood"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Normaalne"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "Täielik konto nimi"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Analüütiline konto"
+
+#. module: analytic
+#: field:account.analytic.account,company_currency_id:0
+msgid "Currency"
+msgstr "Rahaühik"
+
+#. module: analytic
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr "Seotud partner"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Ava"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Analüütilised kirjed"
diff --git a/addons/analytic/i18n/pl.po b/addons/analytic/i18n/pl.po
new file mode 100644
index 00000000000..cd030c52ce4
--- /dev/null
+++ b/addons/analytic/i18n/pl.po
@@ -0,0 +1,270 @@
+# Polish 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-06-18 10:59+0000\n"
+"PO-Revision-Date: 2010-07-26 10:16+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-07-27 03:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Konta podrzędne"
+
+#. module: analytic
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+"Kwota wyrażona w walucie konta, jeśli waluta jest inna niż waluta firmy."
+
+#. 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"
+msgstr "Nazwa konta"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr "Określa ilość do obliczeń."
+
+#. module: analytic
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr "Waluta konta, jeśli waluta jest inna niż firmy."
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+"Moduł do definiowania obiektów księgowości analitycznej.\n"
+"    "
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Stan"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Główna(y) księgowa(y)"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Projekt"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Zamknięte"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Winien"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state.                           "
+"       \n"
+"* If any associated partner is there, it can be in 'Open' state.             "
+"                     \n"
+"* If any pending balance is there it can be in 'Pending'.                    "
+"               \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project.                            "
+"     \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "Typ Konta"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Szablon"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "Oczekujące"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "Ilość maksymalna"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Użytkownik"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Nadrzędne konto analityczne"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "Waluta konta"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Widok"
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Ma"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Kwota"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Anulowano"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Saldo"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Data rozpoczęcia"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Ilość"
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Data końcowa"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Kod konta"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Normalne"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "Pełna nazwa konta"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Konto analityczne"
+
+#. module: analytic
+#: field:account.analytic.account,company_currency_id:0
+msgid "Currency"
+msgstr "Waluta"
+
+#. module: analytic
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr "Waluta kwoty"
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr "Przypisany partner"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Otwarte"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Zapisy analityczne"
diff --git a/addons/analytic/i18n/sl.po b/addons/analytic/i18n/sl.po
new file mode 100644
index 00000000000..48d92ea1941
--- /dev/null
+++ b/addons/analytic/i18n/sl.po
@@ -0,0 +1,266 @@
+# 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-06-18 10:59+0000\n"
+"PO-Revision-Date: 2010-07-28 12:27+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-07-29 03:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Podrejeni konti"
+
+#. module: analytic
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+
+#. 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"
+msgstr "Naziv konta"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Odgovorni za stranko"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Zaprto"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Breme"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state.                           "
+"       \n"
+"* If any associated partner is there, it can be in 'Open' state.             "
+"                     \n"
+"* If any pending balance is there it can be in 'Pending'.                    "
+"               \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project.                            "
+"     \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "Vrsta konta"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Predloga"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "Čakajoči"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Družba"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "Največja količina"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Nadrejeni analitični konto"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "Valuta konta"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Pogled"
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Dobro"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Znesek"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Stik"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Preklicano"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Stanje"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Datum začetka"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Datum konca"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Običajno"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "Polni naziv konta"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Analitični konto"
+
+#. module: analytic
+#: field:account.analytic.account,company_currency_id:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: analytic
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr "Pridružen partner"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Odpri"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Analitične vknjižbe"
diff --git a/addons/analytic/i18n/zh_CN.po b/addons/analytic/i18n/zh_CN.po
new file mode 100644
index 00000000000..2d065254cde
--- /dev/null
+++ b/addons/analytic/i18n/zh_CN.po
@@ -0,0 +1,275 @@
+# 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-06-18 10:59+0000\n"
+"PO-Revision-Date: 2010-07-19 19:39+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-07-21 03:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "子项"
+
+#. module: analytic
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+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"
+msgstr "项名称"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr "指定金额的数量用来计算"
+
+#. module: analytic
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr "如果不是同一公司, 这相关项的货币"
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+"模块定义辅助核算对象\n"
+"    "
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "状态"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "项管理"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "已关闭"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "借方"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state.                           "
+"       \n"
+"* If any associated partner is there, it can be in 'Open' state.             "
+"                     \n"
+"* If any pending balance is there it can be in 'Pending'.                    "
+"               \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project.                            "
+"     \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+"*当创建这项时为'草稿'状态.\n"
+"*如果有任何相关的业务伙伴它是'待处理'状态.\n"
+"*如果有任何悬而未决的差额它为'悬而未决'状态.\n"
+"*当所有交易已结束, 它是'关闭'状态\n"
+"\n"
+"*该项目状态可为其中之一, 如果是'模板'状态我们能按项目模板来建造项目, 如果为'运行中'它是一正常项目\n"
+"如果需要审查则状态为'悬而未决'\n"
+"当项目结束状态为'完成'"
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "项类型"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "模板"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "悬而未决"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "辅助核算明细"
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "说明"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price."
+msgstr "乘与数量和价格, 提供产品的成本价格"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "最大数量"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "上级辅助核算项"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "辅助核算项货币"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "视图"
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr "设置较高的小时数限制"
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "贷方"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "金额"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "联系方式"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "差额"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "开始日期"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "结束日期"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "辅助核算项代码"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "正常"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "所有项目名称"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "辅助核算项"
+
+#. module: analytic
+#: field:account.analytic.account,company_currency_id:0
+msgid "Currency"
+msgstr "货币"
+
+#. module: analytic
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr "货币金额"
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr "相关业务伙伴"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "待处理"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "辅助核算记录"
diff --git a/addons/analytic_journal_billing_rate/__openerp__.py b/addons/analytic_journal_billing_rate/__openerp__.py
index f77f5ad625c..b422240751c 100644
--- a/addons/analytic_journal_billing_rate/__openerp__.py
+++ b/addons/analytic_journal_billing_rate/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -30,7 +30,7 @@
     Obviously if no data has been recorded for the current account, the default value is given as usual by the account data so that this module is perfectly compatible with older configurations.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['analytic_user_function', 'account', 'hr_timesheet_invoice'],
     'init_xml': [],
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_CN.po b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
index 4b85391f013..765982cfc04 100644
--- a/addons/analytic_journal_billing_rate/i18n/zh_CN.po
+++ b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
@@ -7,55 +7,55 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:31+0000\n"
+"PO-Revision-Date: 2010-07-14 03: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-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构XML文件!"
+msgstr "无效XML视图结构!"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,journal_id:0
 msgid "Analytic Journal"
-msgstr "辅助核算分类帐"
+msgstr "辅助核算记录集合"
 
 #. module: analytic_journal_billing_rate
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: analytic_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
 msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "辅助核算分类帐中每个分类帐的记帐标准"
+msgstr "辅助核算记录集合中每个记录集合的开单税率"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算分类帐"
+msgstr "辅助核算项"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
 msgid "Relation table between journals and billing rates"
-msgstr "分类帐和记帐标准的关系表"
+msgstr "记录集合和开票税率的关系表"
 
 #. module: analytic_journal_billing_rate
 #: field:account.analytic.account,journal_rate_ids:0
 msgid "Invoicing Rate per Journal"
-msgstr "分类帐的开票税率"
+msgstr "每个记录集合的的开票税率"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
 msgid "Analytic Journal Billing Rate"
-msgstr "辅助核算分类帐的记帐标准"
+msgstr "辅助核算集合的开票税率"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,rate_id:0
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index 072d6cfc4f9..8f6af6f84b7 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@
     Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['hr_timesheet_sheet'],
     'init_xml': [],
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index 034ad99e623..e20db0149f5 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:31+0000\n"
+"PO-Revision-Date: 2010-07-14 03:52+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-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+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文件!"
+msgstr "无效XML视图结构!"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
@@ -51,7 +51,7 @@ msgstr "用户"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
@@ -63,6 +63,10 @@ msgstr "辅助核算用的函数"
 msgid "User's Product for this Analytic Account"
 msgstr "用户的产品辅助核算项"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "错误！"
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 38d3f2e787e..ff7eef35255 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '0.1',
     'category': 'Profile',
     'description': """This module is to create Profile for Associates""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['membership', 'event'],
     'update_xml': ['security/ir.model.access.csv', 'profile_association.xml'],
     'demo_xml': [],
diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py
index ab437baf2c8..f102d710fd8 100644
--- a/addons/association/profile_association.py
+++ b/addons/association/profile_association.py
@@ -29,7 +29,7 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
     _columns = {
         'hr_expense':fields.boolean('Expenses Tracking', help="Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."),
         'project':fields.boolean('Project Management'),
-        'event_project':fields.boolean('Organization and management of events', help="This module allows you to create retro planning for managing your events."),
+        'event_project':fields.boolean('Organization and management of Events', help="This module allows you to create retro planning for managing your events."),
         'project_gtd':fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
         'wiki': fields.boolean('Wiki', 
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index c1ee9e163fe..630b02790b8 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -18,6 +18,9 @@
                        position="attributes">
                   <attribute name="string">Install more modules. A few modules are proposed according to the Association Profile you selected. You will be able to install them based on our requirements.</attribute>
                 </xpath>
+                <xpath expr="//button[@string='Install Modules']" position="attributes">
+                    <attribute name="string">Configure</attribute>
+                </xpath>
                 <separator string="title" position="replace"/>
                 <group colspan="8">
                   <separator string="Project Management" colspan="4"/>
@@ -59,5 +62,10 @@
       		</xpath>
       	</field>
 		</record>
+
+		<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
+		<menuitem name="Events Organisation" id="base.menu_event_main" parent="base.menu_association" />
+		<menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
+		<menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
     </data>
 </openerp>
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index f9940571143..7d96fe90aa1 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -38,7 +38,7 @@
        * Objects Statistics (list)
        * My Objects By Day (list)
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base', 'account', 'hr_attendance'],
     'init_xml': ['auction_sequence.xml'],
     'update_xml': [
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index e7c6198579a..e55d999a1d1 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -695,7 +695,7 @@ class auction_lots(osv.osv):
             #   wf_service = netsvc.LocalService('workflow')
             #   wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr)
             inv_ref.button_compute(cr, uid, invoice.values())
-            wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_proforma', cr)
+            wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_proforma2', cr)
         return invoices.values()
 
 
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 91b2d171906..dad4d39b776 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -231,7 +231,7 @@
         <field name="type">tree</field>
         <field name="priority" eval="1"/>
         <field name="arch" type="xml">
-            <tree string="Catalog">
+            <tree colors="blue:state in ('unsold','draft');black:state in ('sold','taken_away');gray:state in ('paid') " string="Catalog">
                 <field name="obj_num" string="Ref" select="1"/>
                 <field name="name" select="1"/>
                 <field name="ach_login"/>
@@ -1366,7 +1366,7 @@ Auction adjudication
         <field name="model">report.auction.adjudication</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Total adjudication">
+            <tree colors="blue:state in ('draft');black:state in ('close')" string="Total adjudication">
                 <field name="name" select="1"/>
                 <field name="adj_total" select="1"/>
                 <field name="state" select="1"/>
@@ -1540,7 +1540,7 @@ Object encoded
         <field name="model">report.unclassified.objects</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Unclassified objects">
+            <tree colors="blue:state in ('draft','unsold');black:state in ('sold');gray:state in ('paid')" string="Unclassified objects">
                 <field name="obj_num" string="Ref" select="1"/>
                 <field name="name" select="1"/>
                 <field name="ach_login"/>
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index ca4b30bd688..6693622d55c 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -58,7 +58,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_auction_manager_form"/>
         </record>
-        <menuitem icon="terp-graph" name="Dashboard" id="menu_board_auction" parent="auction_report_menu" sequence="0"/>
+        <menuitem name="Dashboard" id="menu_board_auction" parent="auction_report_menu" sequence="0"/>
         <menuitem
             name="Auction Member"
             action="open_board_auction"
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index 46ddbdca567..f75e1d73416 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/i18n/pt_BR.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* auction
+#	* auction
 #
 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"
-"PO-Revision-Date: 2010-02-01 18:21+0000\n"
-"Last-Translator: Holverat Bortolossi <holverat@gmail.com>\n"
+"PO-Revision-Date: 2010-07-28 14:41+0000\n"
+"Last-Translator: Leandro Chaves <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-06-22 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -32,16 +32,18 @@ msgid "Set to draft"
 msgstr "Definir como rascunho"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0 view:auction.lots:0
-#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0
+#: view:auction.lots:0
+#: field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0
+#: field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Loja"
 
 #. module: auction
 #: 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."
+msgstr "Nome de modelo inválido na definição da ação"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
@@ -87,18 +89,23 @@ msgid "Deposit Form"
 msgstr "Formulário de Depósitos"
 
 #. module: auction
-#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
+#: rml:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0
+#: rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0
+#: field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Comprador"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0
+#: field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Nenhum dos objetos"
 
@@ -120,10 +127,11 @@ msgstr "Numeração (por lote)"
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Books, manuscripts, eso."
-msgstr ""
+msgstr "Antiguidades/Livros, manuscritos, etc."
 
 #. module: auction
-#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0
+#: model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "Limite de Depósito"
 
@@ -195,7 +203,8 @@ msgid "Objects by Auction"
 msgstr "Objetos em leilão"
 
 #. module: auction
-#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0
+#: field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Número de lista"
 
@@ -212,7 +221,7 @@ msgstr "Antiguidades"
 #. module: auction
 #: view:auction.dates:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: auction
 #: field:report.auction.estimation.adj.category,lot_type:0
@@ -230,9 +239,10 @@ msgid "Contemporary Art"
 msgstr "Arte contemporânea"
 
 #. module: auction
-#: view:auction.lots:0 view:report.unclassified.objects:0
+#: view:auction.lots:0
+#: view:report.unclassified.objects:0
 msgid "Ref"
-msgstr ""
+msgstr "Ref."
 
 #. module: auction
 #: field:report.auction.view,nseller:0
@@ -247,10 +257,11 @@ msgstr ""
 #. module: auction
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
+msgstr "Entrada (resp. Saída) deve seguir Saída (resp. Entrada)"
 
 #. module: auction
-#: view:auction.lots:0 field:report.buyer.auction,total_price:0
+#: view:auction.lots:0
+#: field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -260,7 +271,8 @@ msgid "Net margin (%)"
 msgstr "Margem líquida (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -290,7 +302,9 @@ msgid "Seller Costs"
 msgstr "Custos do Vendedor"
 
 #. module: auction
-#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -313,7 +327,8 @@ msgid "Contact"
 msgstr "Contato"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0
+#: field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -326,7 +341,7 @@ msgstr "Enviar SMS"
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Cont. Art/Painting"
-msgstr ""
+msgstr "Cont. Arte/Pintura"
 
 #. module: auction
 #: field:auction.lots,sel_inv_id:0
@@ -354,7 +369,8 @@ msgid "Sold Objects"
 msgstr "Objetos vendidos"
 
 #. module: auction
-#: view:report.buyer.auction2:0 view:report.seller.auction2:0
+#: view:report.buyer.auction2:0
+#: view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "Somar margem líquida"
 
@@ -364,7 +380,9 @@ msgid "Deposit Border Form"
 msgstr "Formuálio de Limite de Depósito"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
+#: field:auction.bid,bid_lines:0
+#: rml:auction.bids:0
+#: rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Lance"
@@ -375,15 +393,17 @@ msgid "Langage"
 msgstr "Idioma"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
-#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+#: view:auction.lots:0
+#: model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Objeto"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_map_user
 msgid "Map buyer username to Partners"
-msgstr ""
+msgstr "Mapear usuário comprador para Parceiros"
 
 #. module: auction
 #: wizard_field:auction.lots.numerotate,search,lot_num:0
@@ -409,9 +429,11 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0 field:auction.lots,state:0
+#: field:auction.dates,state:0
+#: field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0
+#: field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Situação"
@@ -427,7 +449,8 @@ msgid "Antique/Cartoons"
 msgstr "Antigo/Desenhos"
 
 #. module: auction
-#: view:auction.lots:0 selection:auction.lots,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -484,7 +507,7 @@ msgstr "Relatório2 de formulário de Leilão"
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_pay
 msgid "Pay objects of the buyer"
-msgstr ""
+msgstr "Pagar objetos do comprador"
 
 #. module: auction
 #: view:report.deposit.border:0
@@ -512,7 +535,8 @@ msgid "auction.dates"
 msgstr "leilão.datas"
 
 #. module: auction
-#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Vendedores"
 
@@ -739,7 +763,8 @@ msgid "Antique/Toys"
 msgstr "Antiguidade/Briquedos"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Criado por"
 
@@ -867,7 +892,8 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -902,7 +928,8 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -955,13 +982,14 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
+#: field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0 field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0
+#: field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1002,12 +1030,14 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0 view:report.seller.auction2:0
+#: view:report.buyer.auction2:0
+#: view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0 view:report.auction.view2:0
+#: view:auction.dates:0
+#: view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1042,8 +1072,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
-#: xsl:report.auction.deposit:0
+#: rml:report.auction.buyer.result:0
 msgid "Num"
 msgstr ""
 
@@ -1090,7 +1119,8 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0 view:report.object.encoded.manager:0
+#: view:report.object.encoded:0
+#: view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1105,7 +1135,8 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0 rml:bids.phones.details:0
+#: rml:bids.lots:0
+#: rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1149,7 +1180,8 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1165,7 +1197,8 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0
+#: field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1188,7 +1221,8 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0
+#: field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1216,7 +1250,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0 xsl:report.auction.seller.list:0
+#: rml:buyer.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1236,7 +1270,8 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0
+#: field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1305,7 +1340,8 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1377,7 +1413,8 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0
+#: field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1425,7 +1462,8 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1435,7 +1473,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0 xsl:report.auction.seller.list:0
+#: rml:buyer.list:0
 msgid "#"
 msgstr ""
 
@@ -1566,14 +1604,15 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0 rml:bids.phones.details:0
+#: rml:bids.lots:0
+#: rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1604,8 +1643,7 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0
 msgid "Total:"
 msgstr ""
 
@@ -1751,7 +1789,8 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0 field:auction.deposit,lot_id:0
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Objetos"
@@ -1773,9 +1812,10 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
+#: rml:auction.bids:0
+#: view:auction.lots:0
+#: rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1785,12 +1825,17 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0
+#: field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0
+#: field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0
+#: field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0
+#: field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0
+#: field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1852,7 +1897,6 @@ msgstr ""
 
 #. module: auction
 #: field:report.attendance,total_attendance:0
-#: xsl:report.auction.ach_bordereau:0
 msgid "Total"
 msgstr ""
 
@@ -1942,7 +1986,8 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid "Warning, this will erase the object adjudication price and its buyer !"
+msgid ""
+"Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -1966,14 +2011,16 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0
+#: field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2045,7 +2092,8 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0
+#: field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2065,7 +2113,8 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2142,7 +2191,8 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0 selection:auction.lots,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2176,10 +2226,11 @@ msgstr ""
 #. module: auction
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar membros recursivos associados."
 
 #. module: auction
-#: selection:auction.dates,state:0 selection:auction.lots,state:0
+#: selection:auction.dates,state:0
+#: selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2208,7 +2259,8 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0
+#: model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2354,11 +2406,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0 xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0
 msgid "Description"
 msgstr ""
 
@@ -2368,7 +2420,8 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0
+#: field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2430,7 +2483,8 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0 view:report.object.encoded.manager:0
+#: view:report.object.encoded:0
+#: view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index cdd945f6eef..9d1072ee87a 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* auction
+#	* auction
 #
 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"
-"PO-Revision-Date: 2010-06-04 12:37+0000\n"
-"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
+"PO-Revision-Date: 2010-07-15 11:03+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-06-22 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-07-16 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -24,7 +24,7 @@ msgstr "总利润"
 #. module: auction
 #: wizard_view:auction.lots.sms_send,init:0
 msgid "SMS - Gateway: clickatell"
-msgstr "SMS网关"
+msgstr "短信网关：clickatell"
 
 #. module: auction
 #: view:auction.lots:0
@@ -32,22 +32,24 @@ msgid "Set to draft"
 msgstr "设为草稿"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0 view:auction.lots:0
-#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0
+#: view:auction.lots:0
+#: field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0
+#: field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "卖方"
 
 #. module: auction
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中无效的模块名"
+msgstr "在动作定义使用了无效的模块名。"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
 #: selection:auction.lots.send.aie,init,numerotation:0
 msgid "Provisoire"
-msgstr ""
+msgstr "暂时的"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
@@ -58,7 +60,7 @@ msgstr "确定的(订单目录)"
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree1_my
 msgid "My Encoded Objects Per Day"
-msgstr "每天我编码的物品"
+msgstr "我每天编号的物品"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_history
@@ -79,26 +81,31 @@ msgstr "物品#"
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_action_bids_form
 msgid "Bids line"
-msgstr "出价线"
+msgstr "投标线"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Deposit Form"
-msgstr "押金方式"
+msgstr "押金单"
 
 #. module: auction
-#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
+#: rml:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0
+#: rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0
+#: field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "买家"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0
+#: field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "没有物品"
 
@@ -110,7 +117,7 @@ msgstr "拍卖最终结果"
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of paid items (based on invoices):"
-msgstr "(根据发票)支付项目:"
+msgstr "支付项目(根据发票):"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_numerotate_lot
@@ -123,7 +130,8 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "古董/书籍/手稿"
 
 #. module: auction
-#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0
+#: model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "押金最少"
 
@@ -131,7 +139,7 @@ msgstr "押金最少"
 #: wizard_field:auction.lots.make_invoice,init,amount:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,amount:0
 msgid "Invoiced Amount"
-msgstr "发票金额"
+msgstr "已开票金额"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -141,7 +149,7 @@ msgstr "古董/锡/铜制品"
 #. module: auction
 #: field:auction.lots,paid_ach:0
 msgid "Buyer invoice reconciled"
-msgstr "买家发票对账"
+msgstr "买家发票已核销"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_able_taken
@@ -151,7 +159,7 @@ msgstr "标记为带走"
 #. module: auction
 #: xsl:report.auction.seller.list:0
 msgid "Inv."
-msgstr ""
+msgstr "发票"
 
 #. module: auction
 #: field:auction.deposit.cost,amount:0
@@ -195,7 +203,8 @@ msgid "Objects by Auction"
 msgstr "拍卖物品"
 
 #. module: auction
-#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0
+#: field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "表编号"
 
@@ -230,7 +239,8 @@ msgid "Contemporary Art"
 msgstr "当代艺术"
 
 #. module: auction
-#: view:auction.lots:0 view:report.unclassified.objects:0
+#: view:auction.lots:0
+#: view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "参考"
 
@@ -250,9 +260,10 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr "错误:登入必须要先登出"
 
 #. module: auction
-#: view:auction.lots:0 field:report.buyer.auction,total_price:0
+#: view:auction.lots:0
+#: field:report.buyer.auction,total_price:0
 msgid "Total Adj."
-msgstr ""
+msgstr "合计"
 
 #. module: auction
 #: field:report.auction.view2,obj_margin_procent:0
@@ -260,7 +271,8 @@ msgid "Net margin (%)"
 msgstr "净利润(%)"
 
 #. module: auction
-#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -274,7 +286,7 @@ msgstr "日期"
 #. module: auction
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误:销售单位必须要和计量单位不同类型"
+msgstr "错误:销售单位必须和计量单位在不同的分类."
 
 #. module: auction
 #: rml:auction.total.rml:0
@@ -288,7 +300,9 @@ msgid "Seller Costs"
 msgstr "卖家费用"
 
 #. module: auction
-#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -311,7 +325,8 @@ msgid "Contact"
 msgstr "联系"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0
+#: field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr "物品#"
@@ -339,7 +354,7 @@ msgstr "佣金"
 #. module: auction
 #: wizard_button:auction.lots.numerotate,search,init:0
 msgid "Back"
-msgstr "后面"
+msgstr "后退"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_all_objects_unsold
@@ -352,17 +367,20 @@ msgid "Sold Objects"
 msgstr "已卖出的物品"
 
 #. module: auction
-#: view:report.buyer.auction2:0 view:report.seller.auction2:0
+#: view:report.buyer.auction2:0
+#: view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "合计净利润"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Deposit Border Form"
-msgstr "押金最少方式"
+msgstr "最少押金单"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
+#: field:auction.bid,bid_lines:0
+#: rml:auction.bids:0
+#: rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "出价"
@@ -373,15 +391,17 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
-#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+#: view:auction.lots:0
+#: model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "物品"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_map_user
 msgid "Map buyer username to Partners"
-msgstr "从买家用户到业务伙伴"
+msgstr "从买家到业务伙伴"
 
 #. module: auction
 #: wizard_field:auction.lots.numerotate,search,lot_num:0
@@ -407,9 +427,11 @@ msgid "Auction buyer reporting form view"
 msgstr "拍卖买方报表"
 
 #. module: auction
-#: field:auction.dates,state:0 field:auction.lots,state:0
+#: field:auction.dates,state:0
+#: field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0
+#: field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "状态"
@@ -425,7 +447,8 @@ msgid "Antique/Cartoons"
 msgstr "古董/卡通"
 
 #. module: auction
-#: view:auction.lots:0 selection:auction.lots,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -449,7 +472,7 @@ msgstr "费用科目"
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_wizard_emporte
 msgid "Deliveries Management"
-msgstr "发货管理"
+msgstr "交付管理"
 
 #. module: auction
 #: field:auction.lots,obj_desc:0
@@ -482,47 +505,48 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_pay
 msgid "Pay objects of the buyer"
-msgstr ""
+msgstr "买家支付的物品"
 
 #. module: auction
 #: view:report.deposit.border:0
 msgid "Depositer's statistics"
-msgstr ""
+msgstr "押金统计"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer information"
-msgstr ""
+msgstr "买家信息"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_seller_auction
 msgid "Auction Reporting on seller view"
-msgstr ""
+msgstr "拍卖报表卖家视图"
 
 #. module: auction
 #: field:auction.lots,name2:0
 msgid "Short Description (2)"
-msgstr ""
+msgstr "简短描述(2)"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_dates
 msgid "auction.dates"
-msgstr ""
+msgstr "拍卖.日期"
 
 #. module: auction
-#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
-msgstr ""
+msgstr "买家"
 
 #. module: auction
 #: wizard_field:auction.pay.buy,init,amount:0
 #: wizard_field:auction.pay.buy,init,amount2:0
 #: wizard_field:auction.pay.buy,init,amount3:0
 msgid "Amount paid"
-msgstr ""
+msgstr "已付款金额"
 
 #. module: auction
-#: view:board.board:0
+#: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree
 msgid "My Latest Deposits"
 msgstr "我最近的押金"
 
@@ -533,27 +557,27 @@ msgstr "我最近的押金"
 #: field:report.auction.view,min_est:0
 #: field:report.unclassified.objects,lot_est1:0
 msgid "Minimum Estimation"
-msgstr ""
+msgstr "最低估价"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Accounting"
-msgstr ""
+msgstr "会计"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view2
 msgid "Buyer's Revenues"
-msgstr ""
+msgstr "买家收入"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_adjudication
 msgid "report_auction_adjudication"
-msgstr ""
+msgstr "拍卖最终结果报表"
 
 #. module: auction
 #: field:auction.bid_line,price:0
 msgid "Maximum Price"
-msgstr ""
+msgstr "最高价格"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
@@ -563,22 +587,22 @@ msgstr ""
 #. module: auction
 #: view:report.buyer.auction2:0
 msgid "Auction buyer reporting tree view2"
-msgstr ""
+msgstr "拍卖买家报表树视图2"
 
 #. module: auction
 #: wizard_view:auction.lots.sms_send,init:0
 msgid "Bulk SMS send"
-msgstr ""
+msgstr "批量发送SMS"
 
 #. module: auction
 #: wizard_view:auction.taken,init:0
 msgid "Select lots which are Sold"
-msgstr ""
+msgstr "选择已售出的批"
 
 #. module: auction
 #: field:auction.lots,statement_id:0
 msgid "Payment"
-msgstr ""
+msgstr "付款"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
@@ -588,50 +612,50 @@ msgstr ""
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Old weapons and militaria"
-msgstr ""
+msgstr "古董/旧武器和军备"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Oriental Arts/Chineese furnitures"
-msgstr ""
+msgstr "古董/东方艺术品/中国家具"
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Keep until sold"
-msgstr ""
+msgstr "保留直到售出"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,init,choice:0
 #: wizard_button:auction.lots.send.aie,init,date_ask:0
 #: wizard_button:auction.lots.send.aie.results,init,date_ask:0
 msgid "Continue"
-msgstr ""
+msgstr "继续"
 
 #. module: auction
 #: field:report.object.encoded,obj_num:0
 #: field:report.object.encoded.manager,obj_num:0
 msgid "# of Encoded obj."
-msgstr ""
+msgstr "# 物品编码"
 
 #. module: auction
 #: xsl:report.auction.vnd_bordereau:0
 msgid "List N."
-msgstr ""
+msgstr "列表 N"
 
 #. module: auction
 #: field:report.deposit.border,moy_est:0
 msgid "Avg. Est"
-msgstr ""
+msgstr "平均值"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of sellers:"
-msgstr ""
+msgstr "# 卖家"
 
 #. module: auction
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误:无效EAN编码"
 
 #. module: auction
 #: model:ir.module.module,description:auction.module_meta_information
@@ -642,26 +666,31 @@ msgid ""
 "     Delivery Management. \n"
 "    "
 msgstr ""
+"这模块提供以下功能\n"
+"    管理艺术家, 作品, 买家, 卖家和拍卖\n"
+"    管理出价, 售出跟踪, 支付和未售出物品\n"
+"    交付管理 \n"
+"    "
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of items taken away:"
-msgstr ""
+msgstr "# 带走的物品:"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_allmonth_view1
 msgid "Auction's Summary"
-msgstr ""
+msgstr "拍卖合计:"
 
 #. module: auction
 #: rml:buyer.list:0
 msgid "%)"
-msgstr ""
+msgstr "%)"
 
 #. module: auction
 #: wizard_view:auction.lots.able,init:0
 msgid "Confirmation set taken away"
-msgstr ""
+msgstr "确认设为带走"
 
 #. module: auction
 #: wizard_field:auction.lots.make_invoice,init,objects:0
@@ -670,7 +699,7 @@ msgstr ""
 #: wizard_field:auction.lots.send.aie.results,date_ask,objects:0
 #: field:report.deposit.border,nb_obj:0
 msgid "# of objects"
-msgstr ""
+msgstr "# 物品"
 
 #. module: auction
 #: field:auction.lots,lot_est2:0
@@ -679,82 +708,83 @@ msgstr ""
 #: field:report.auction.view,max_est:0
 #: field:report.unclassified.objects,lot_est2:0
 msgid "Maximum Estimation"
-msgstr ""
+msgstr "最高估价"
 
 #. module: auction
 #: field:auction.lots,buyer_price:0
 msgid "Buyer price"
-msgstr ""
+msgstr "买家价格"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_payer_sel
 msgid "Mark as paid for seller"
-msgstr ""
+msgstr "标记为卖家支付"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.seller_form_id
 msgid "Seller List"
-msgstr ""
+msgstr "卖家列表"
 
 #. module: auction
 #: field:auction.lots,is_ok:0
 msgid "Buyer's payment"
-msgstr ""
+msgstr "买家付款"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Close + Create all invoices"
-msgstr ""
+msgstr "费用 + 创建所有发票"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_catalog_flagy
 msgid "Auction Catalog Flagey"
-msgstr ""
+msgstr "拍卖目录Flagey"
 
 #. module: auction
 #: field:auction.lot.history,price:0
 msgid "Withdrawn price"
-msgstr ""
+msgstr "撤销价格"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax4
 msgid "Seller Costs1"
-msgstr ""
+msgstr "卖家成本1"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Verreries"
-msgstr ""
+msgstr "古董/玻璃器皿"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Toys"
-msgstr ""
+msgstr "古董/玩具"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
 msgid "Created by"
-msgstr ""
+msgstr "创建者"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
 msgid "Buyer form"
-msgstr ""
+msgstr "买家"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Estimate"
-msgstr ""
+msgstr "预计"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of buyers:"
-msgstr ""
+msgstr "# 买家:"
 
 #. module: auction
 #: field:auction.lots,costs:0
 msgid "Indirect costs"
-msgstr ""
+msgstr "间接成本"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
@@ -764,53 +794,53 @@ msgstr ""
 #. module: auction
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "错误!你不能创建递归的科目"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_menu_root
 msgid "Auction Management"
-msgstr ""
+msgstr "拍卖管理"
 
 #. module: auction
 #: field:auction.dates,journal_seller_id:0
 msgid "Seller Journal"
-msgstr ""
+msgstr "卖家记录集合"
 
 #. module: auction
 #: view:report.buyer.auction:0
 msgid "Auction buyer reporting tree view"
-msgstr ""
+msgstr "拍卖买家报表树视图"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_artist
 msgid "Define Artists"
-msgstr ""
+msgstr "定义艺术家"
 
 #. module: auction
 #: field:auction.lot.category,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "类别名称"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_manager
 #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_member
 msgid "Comparison of estimations"
-msgstr ""
+msgstr "估价比较"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
 msgid "Code barres du lot"
-msgstr ""
+msgstr "条码批"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,not_exist,init:0
 msgid "Retry"
-msgstr ""
+msgstr "重试"
 
 #. module: auction
 #: field:auction.artists,birth_death_dates:0
 msgid "Birth / Death dates"
-msgstr ""
+msgstr "出生/ 死亡日期"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -820,7 +850,7 @@ msgstr ""
 #. module: auction
 #: model:ir.model,name:auction.model_report_unclassified_objects
 msgid "Unclassified objects "
-msgstr ""
+msgstr "无类别物品 "
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate_cont,init,set_number:0
@@ -837,22 +867,22 @@ msgstr ""
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Document type"
-msgstr ""
+msgstr "文档类型"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_estimation_adj_category
 msgid "comparaison estimate/adjudication "
-msgstr ""
+msgstr "估价比价/ 最终结果 "
 
 #. module: auction
 #: rml:buyer.list:0
 msgid "Adj(EUR)"
-msgstr ""
+msgstr "最终结果(EUR)"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Cont. Art/Other Media"
-msgstr ""
+msgstr "艺术品/ 其它媒体"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_emporte
@@ -860,42 +890,44 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_object_cat
 msgid "Object Categories"
-msgstr ""
+msgstr "物品类别"
 
 #. module: auction
 #: wizard_field:auction.lots.send.aie,date_ask,img_send:0
 msgid "Send Image also ?"
-msgstr ""
+msgstr "也传送图像?"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "General Informations"
-msgstr ""
+msgstr "一般信息"
 
 #. module: auction
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "在这动作定义中无效的模块名"
+msgstr "无效XML视图结构!"
 
 #. module: auction
 #: view:report.auction.view:0
 msgid "Auctions results"
-msgstr ""
+msgstr "拍卖结果"
 
 #. module: auction
 #: wizard_field:auction.lots.sms_send,init,app_id:0
 msgid "API ID"
-msgstr ""
+msgstr "API ID"
 
 #. module: auction
-#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -907,40 +939,40 @@ msgstr ""
 #. module: auction
 #: field:report.buyer.auction2,net_margin:0
 msgid "Net Margin"
-msgstr ""
+msgstr "净利润"
 
 #. module: auction
 #: field:auction.lots,vnd_lim_net:0
 msgid "Net limit ?"
-msgstr ""
+msgstr "净极限?"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of commissions:"
-msgstr ""
+msgstr "# 佣金:"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_unclassified_objects
 #: model:ir.ui.menu,name:auction.menu_all_objects_unclassified
 #: view:report.unclassified.objects:0
 msgid "Unclassified objects"
-msgstr ""
+msgstr "无类别物品"
 
 #. module: auction
 #: wizard_view:auction.lots.make_invoice_buyer,init:0
 msgid "(Keep empty for automatic number)"
-msgstr ""
+msgstr "(空为自动编号)"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_object_date
 #: view:report.auction.object.date:0
 msgid "Objects per day"
-msgstr ""
+msgstr "每天物品"
 
 #. module: auction
 #: model:product.template,name:auction.monproduit_product_template
 msgid "Oeuvres a 21%"
-msgstr ""
+msgstr "全部 21%"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -948,97 +980,99 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
+#: field:report.object.encoded.manager,adj:0
 msgid "Adj."
-msgstr ""
+msgstr "最终结果"
 
 #. module: auction
-#: field:auction.lot.history,name:0 field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0
+#: field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: auction
 #: field:auction.lots,obj_ret:0
 msgid "Price retired"
-msgstr ""
+msgstr "价格撤回"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Extra Costs"
-msgstr ""
+msgstr "额外费用"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_new
 msgid "New Auction Dates"
-msgstr ""
+msgstr "新拍卖日期"
 
 #. module: auction
 #: field:auction.lots,paid_vnd:0
 msgid "Seller Paid"
-msgstr ""
+msgstr "卖家支付"
 
 #. module: auction
 #: field:auction.deposit,date_dep:0
 msgid "Deposit date"
-msgstr ""
+msgstr "押金日期"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.id_deposit
 msgid "Deposits"
-msgstr ""
+msgstr "押金"
 
 #. module: auction
 #: field:auction.deposit,specific_cost_ids:0
 msgid "Specific Costs"
-msgstr ""
+msgstr "特别费用"
 
 #. module: auction
-#: view:report.buyer.auction2:0 view:report.seller.auction2:0
+#: view:report.buyer.auction2:0
+#: view:report.seller.auction2:0
 msgid "Sum adj"
-msgstr ""
+msgstr "最终结果合计"
 
 #. module: auction
-#: view:auction.dates:0 view:report.auction.view2:0
+#: view:auction.dates:0
+#: view:report.auction.view2:0
 msgid "Auctions"
-msgstr ""
+msgstr "拍卖"
 
 #. module: auction
 #: field:report.seller.auction,object_number:0
 msgid "No of Objects"
-msgstr ""
+msgstr "没物品"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "History"
-msgstr ""
+msgstr "日志"
 
 #. module: auction
 #: field:auction.lot.category,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "优先级"
 
 #. module: auction
 #: rml:auction.code_bar_lot:0
 msgid "Nr."
-msgstr ""
+msgstr "Nr."
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Painting"
-msgstr ""
+msgstr "古董/ 绘画"
 
 #. module: auction
 #: field:auction.lot.category,aie_categ:0
 msgid "Aie Category"
-msgstr ""
+msgstr "Aie类别"
 
 #. module: auction
-#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
-#: xsl:report.auction.deposit:0
+#: rml:report.auction.buyer.result:0
 msgid "Num"
-msgstr ""
+msgstr "编号"
 
 #. module: auction
 #: wizard_button:auction.lots.able,init,end:0
@@ -1055,144 +1089,149 @@ msgstr ""
 #: wizard_button:auction.pay.buy,init,end:0
 #: wizard_button:auction.payer.sel,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Beginning of the auction"
-msgstr ""
+msgstr "开始拍卖"
 
 #. module: auction
 #: field:auction.artists,biography:0
 msgid "Biography"
-msgstr ""
+msgstr "传记"
 
 #. module: auction
 #: field:auction.lots,lot_local:0
 msgid "Location"
-msgstr ""
+msgstr "位置"
 
 #. module: auction
 #: wizard_view:auction.payer.sel,init:0
 msgid "Check payment for seller"
-msgstr ""
+msgstr "检查卖家付款"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.view_report_object_by_auction
 msgid "Detailed lots"
-msgstr ""
+msgstr "详细"
 
 #. module: auction
-#: view:board.board:0
+#: view:report.object.encoded:0
+#: view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "物品统计"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Analytic"
-msgstr ""
+msgstr "分析"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_results
 msgid "Send results to Auction-in-europe.com"
-msgstr ""
+msgstr "发送结果到europe.com"
 
 #. module: auction
-#: rml:bids.lots:0 rml:bids.phones.details:0
+#: rml:bids.lots:0
+#: rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Decrease limit of 10%"
-msgstr ""
+msgstr "减少10%极限"
 
 #. module: auction
 #: field:auction.dates,adj_total:0
 #: field:report.auction.adjudication,adj_total:0
 #: field:report.auction.estimation.adj.category,adj_total:0
 msgid "Total Adjudication"
-msgstr ""
+msgstr "最终结果合计"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_reporting1
 #: model:ir.actions.act_window,name:auction.action_auction_reporting_all1
 #: model:ir.actions.act_window,name:auction.action_auction_reporting_all2
 msgid "Seller's auction"
-msgstr ""
+msgstr "卖家拍卖"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_invoice_buyer1
 msgid "Invoice Buyer objects"
-msgstr ""
+msgstr "买家物品发票"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_seller_allmonth_view2
 msgid "Seller's Revenues"
-msgstr ""
+msgstr "卖家收入"
 
 #. module: auction
 #: xsl:flagey.huissier:0
 msgid "Price"
-msgstr ""
+msgstr "价格"
 
 #. module: auction
 #: rml:bids.phones.details:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Photos"
-msgstr ""
+msgstr "相片"
 
 #. module: auction
 #: wizard_field:auction.lots.make_invoice,init,number:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "发票编号"
 
 #. module: auction
-#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0
+#: field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
 msgid "Create Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view1
 msgid "Buyer's Summary"
-msgstr ""
+msgstr "买家综述"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "客户参考"
 
 #. module: auction
 #: rml:bids.lots:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: auction
-#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0
+#: field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
 msgid "Depositer Inventory"
-msgstr ""
+msgstr "押金目录"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_deposit_tree_m
 #: model:ir.ui.menu,name:auction.menu_report_deposit_tree_member
 msgid "Depositer's Statistics"
-msgstr ""
+msgstr "押金统计"
 
 #. module: auction
 #: view:report.object.encoded.manager:0
@@ -1206,37 +1245,38 @@ msgstr ""
 #: wizard_field:auction.lots.send.aie.results,init,uname:0
 #: wizard_field:auction.lots.sms_send,init,user:0
 msgid "Login"
-msgstr ""
+msgstr "登录"
 
 #. module: auction
-#: rml:buyer.list:0 xsl:report.auction.seller.list:0
+#: rml:buyer.list:0
 msgid "To pay"
-msgstr ""
+msgstr "支付"
 
 #. module: auction
 #: wizard_button:auction.lots.enable,init,go:0
 msgid "Enable Taken away"
-msgstr ""
+msgstr "允许带走"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Others"
-msgstr ""
+msgstr "古董/ 其它"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.seller_lots_3
 msgid "Seller Form"
-msgstr ""
+msgstr "卖家单"
 
 #. module: auction
-#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0
+#: field:report.unclassified.objects,lot_type:0
 msgid "Object category"
-msgstr ""
+msgstr "物品类别"
 
 #. module: auction
 #: wizard_view:auction.taken,init:0
 msgid "Mark Lots"
-msgstr ""
+msgstr "建立批"
 
 #. module: auction
 #: field:auction.lots,obj_num:0
@@ -1244,63 +1284,64 @@ msgstr ""
 #: wizard_field:auction.lots.numerotate,search,obj_num:0
 #: field:report.unclassified.objects,obj_num:0
 msgid "Catalog Number"
-msgstr ""
+msgstr "目录号"
 
 #. module: auction
 #: view:report.auction.view2:0
 msgid "Auction Reporting tree view2"
-msgstr ""
+msgstr "拍卖报表树视图2"
 
 #. module: auction
 #: view:report.buyer.auction2:0
 msgid "Auction buyer reporting form view2"
-msgstr ""
+msgstr "拍卖买家报表视图2"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.bid_phone
 msgid "Bids phones"
-msgstr ""
+msgstr "出价电话"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_report_object_by_auction
 msgid "Auction dates"
-msgstr ""
+msgstr "拍卖日期"
 
 #. module: auction
 #: view:report.seller.auction2:0
 msgid "Auction seller reporting2 graph view"
-msgstr ""
+msgstr "拍卖卖家报表图形视图"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree
 msgid "Encoded Objects Per Day"
-msgstr ""
+msgstr "每天编号的物品"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_buyer_auction
 #: model:ir.model,name:auction.model_report_buyer_auction2
 msgid "Auction Reporting on buyer view"
-msgstr ""
+msgstr "拍卖报表买家视图"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Debit:"
-msgstr ""
+msgstr "借方:"
 
 #. module: auction
 #: field:auction.lots,author_right:0
 msgid "Author rights"
-msgstr ""
+msgstr "作者"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Payment's history"
-msgstr ""
+msgstr "付款日志"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Document"
-msgstr ""
+msgstr "文档"
 
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
@@ -1310,39 +1351,39 @@ msgstr ""
 #. module: auction
 #: view:report.auction.view:0
 msgid "Auction results"
-msgstr ""
+msgstr "拍卖结果"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_allmonth_view2
 msgid "Auction's Revenues"
-msgstr ""
+msgstr "拍卖收入"
 
 #. module: auction
 #: view:report.object.encoded.manager:0
 msgid "Total net rev."
-msgstr ""
+msgstr "净收入合计"
 
 #. module: auction
 #: wizard_button:auction.lots.buyer_map,check,set_buyer:0
 msgid "Update"
-msgstr ""
+msgstr "更新"
 
 #. module: auction
 #: rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_seller_menu
 #: model:ir.ui.menu,name:auction.auction_seller_menu
 msgid "Sellers"
-msgstr ""
+msgstr "卖家"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Metal Ware"
-msgstr ""
+msgstr "古董/ 金属制品"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.res_w_buyer
 msgid "Results with buyer"
-msgstr ""
+msgstr "结果与买家"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
@@ -1352,32 +1393,33 @@ msgstr ""
 #. module: auction
 #: wizard_button:auction.lots.auction_move,init,set_date:0
 msgid "Move to Auction date"
-msgstr ""
+msgstr "移动到拍卖日"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_dates_old
 msgid "Old Auctions"
-msgstr ""
+msgstr "以前的拍卖"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of unsold items:"
-msgstr ""
+msgstr "# 未售出项"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Cont. Art/Curiosa"
-msgstr ""
+msgstr "艺术品/ 珍品"
 
 #. module: auction
-#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0
+#: field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
 #: wizard_field:auction.lots.send.aie.results,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie.results,init,dates:0
 msgid "Auction Date"
-msgstr ""
+msgstr "拍卖日期"
 
 #. module: auction
 #: rml:auction.code_bar_lot:0
@@ -1387,108 +1429,109 @@ msgstr ""
 #. module: auction
 #: model:ir.module.module,shortdesc:auction.module_meta_information
 msgid "Auction module"
-msgstr ""
+msgstr "拍卖模块"
 
 #. module: auction
 #: field:auction.bid_line,auction:0
 msgid "Auction Name"
-msgstr ""
+msgstr "拍卖名"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_sign_in_out_manager_tree1
 #: model:ir.ui.menu,name:auction.menu_report_auction_sign_in_out_member_tree1
 msgid "Attendance"
-msgstr ""
+msgstr "出席"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Seller information"
-msgstr ""
+msgstr "卖家信息"
 
 #. module: auction
 #: field:auction.lots,ach_login:0
 #: wizard_field:auction.lots.buyer_map,check,ach_login:0
 #: field:report.unclassified.objects,ach_login:0
 msgid "Buyer Username"
-msgstr ""
+msgstr "买家用户名"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Cont. Art/Jewelry"
-msgstr ""
+msgstr "艺术品/ 珠宝"
 
 #. module: auction
-#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
-msgstr ""
+msgstr "目录"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_dates_next
 msgid "Next Auctions"
-msgstr ""
+msgstr "下一拍卖"
 
 #. module: auction
-#: rml:buyer.list:0 xsl:report.auction.seller.list:0
+#: rml:buyer.list:0
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #. module: auction
 #: field:auction.lots,ach_emp:0
 msgid "Taken Away"
-msgstr ""
+msgstr "带走"
 
 #. module: auction
 #: view:report.object.encoded.manager:0
 msgid "Total gross rev."
-msgstr ""
+msgstr "未打折收入合计"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Miniatures / Collections"
-msgstr ""
+msgstr "古董/ 袖珍/ 收藏"
 
 #. module: auction
 #: wizard_view:auction.lots.numerotate,not_exist:0
 msgid "This lot does not exist !"
-msgstr ""
+msgstr "这批不存在!"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "End of auction"
-msgstr ""
+msgstr "拍卖结束"
 
 #. module: auction
 #: field:auction.bid_line,call:0
 msgid "To be Called"
-msgstr ""
+msgstr "被称为"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_report_auction_estimation_adj_category_manager_tree
 #: model:ir.actions.act_window,name:auction.action_report_auction_estimation_adj_category_member_tree
 #: view:report.auction.estimation.adj.category:0
 msgid "Min est/Adj/Max est"
-msgstr ""
+msgstr "最少估价/ 最终结果/ 最高估价"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.lot_list_inv
 msgid "Lots List - Landscape"
-msgstr ""
+msgstr "批列表 - Landscape"
 
 #. module: auction
 #: view:report.seller.auction:0
 msgid "Auction reporting tree view"
-msgstr ""
+msgstr "拍卖报表树视图"
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
 #: model:ir.actions.wizard,name:auction.wizard_change_auction
 msgid "Change Auction Date"
-msgstr ""
+msgstr "修改拍卖日期"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Cont. Art/Photo"
-msgstr ""
+msgstr "艺术品/ 照片"
 
 #. module: auction
 #: field:auction.deposit,method:0
@@ -1498,76 +1541,77 @@ msgstr ""
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Max Estimate:"
-msgstr ""
+msgstr "最高估计"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_bid
 msgid "Bid auctions"
-msgstr ""
+msgstr "拍卖出价"
 
 #. module: auction
 #: field:report.auction.view2,obj_margin:0
 msgid "Avg margin"
-msgstr ""
+msgstr "平均利润"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Art from the Ivory Coast"
-msgstr ""
+msgstr "古董/ 象牙海岸的艺术品"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Religiosa"
-msgstr ""
+msgstr "古董/ 宗教"
 
 #. module: auction
 #: wizard_button:auction.lots.make_invoice,init,invoice:0
 #: wizard_button:auction.lots.make_invoice_buyer,init,invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "创建发票"
 
 #. module: auction
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "错误:默认的计量单位和采购的计量单位必须是同一类型."
 
 #. module: auction
 #: xsl:report.auction.vnd_bordereau:0
 msgid "Lot"
-msgstr ""
+msgstr "批号"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_all_objects_unplanned1
 msgid "Unplanned objects"
-msgstr ""
+msgstr "无计划的物品"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Cont. Art/Sculpture"
-msgstr ""
+msgstr "艺术品/ 雕像"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_artists
 msgid "auction.artists"
-msgstr ""
+msgstr "拍卖.艺术家"
 
 #. module: auction
 #: field:auction.dates,journal_id:0
 msgid "Buyer Journal"
-msgstr ""
+msgstr "买家记录集合"
 
 #. module: auction
-#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
-msgstr ""
+msgstr "已付"
 
 #. module: auction
-#: rml:bids.lots:0 rml:bids.phones.details:0
+#: rml:bids.lots:0
+#: rml:bids.phones.details:0
 msgid "Phone"
-msgstr ""
+msgstr "电话"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -1578,49 +1622,48 @@ msgstr ""
 #: wizard_button:auction.pay.buy,init,pay:0
 #: wizard_button:auction.payer.sel,init,pay2:0
 msgid "Pay"
-msgstr ""
+msgstr "支付"
 
 #. module: auction
 #: field:auction.lot.category,active:0
 msgid "Active"
-msgstr ""
+msgstr "有效"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Lightings"
-msgstr ""
+msgstr "古董/ 灯饰"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Sculpture, bronze, eso."
-msgstr ""
+msgstr "古董/ 雕塑, 青铜"
 
 #. module: auction
-#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0
 msgid "Total:"
-msgstr ""
+msgstr "合计:"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax2
 msgid "TVA1"
-msgstr ""
+msgstr "增值税1"
 
 #. module: auction
 #: view:report.auction.object.date:0
 msgid "Objects per Day"
-msgstr ""
+msgstr "每天的物品"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Document Number"
-msgstr ""
+msgstr "文档编号"
 
 #. module: auction
 #: field:report.object.encoded.manager,obj_margin:0
 #: field:report.seller.auction2,net_margin:0
 msgid "Net margin"
-msgstr ""
+msgstr "净利润"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,search,set_number:0
@@ -1630,7 +1673,7 @@ msgstr ""
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Buyer, Price"
-msgstr ""
+msgstr "买家, 价格"
 
 #. module: auction
 #: rml:auction.code_bar_lot:0
@@ -1645,49 +1688,49 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,vnd_lim:0
 msgid "Seller limit"
-msgstr ""
+msgstr "卖家极限"
 
 #. module: auction
 #: wizard_view:auction.lots.buyer_map,done:0
 msgid "All objects are assigned to buyers !"
-msgstr ""
+msgstr "所有物品分配给买家"
 
 #. module: auction
 #: wizard_button:auction.lots.able,init,go:0
 msgid "Able Taken away"
-msgstr ""
+msgstr "能带走"
 
 #. module: auction
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: auction
 #: field:auction.deposit,transfer:0
 msgid "Transfer"
-msgstr ""
+msgstr "转移"
 
 #. module: auction
 #: view:report.auction.adjudication:0
 #: field:report.seller.auction,total_price:0
 msgid "Total adjudication"
-msgstr ""
+msgstr "最终结果合计"
 
 #. module: auction
 #: field:auction.lots,artist2_id:0
 msgid "Artist/Author 2"
-msgstr ""
+msgstr "艺术家/ 作者2"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_seller_allmonth_view1
 msgid "Seller's Summary"
-msgstr ""
+msgstr "卖家摘要"
 
 #. module: auction
 #: view:report.seller.auction:0
 msgid "Auction reporting graph view"
-msgstr ""
+msgstr "拍卖报表图形视图"
 
 #. module: auction
 #: wizard_field:auction.taken,init,lot_ids:0
@@ -1698,17 +1741,17 @@ msgstr ""
 #: wizard_button:auction.lots.send.aie,date_ask,send:0
 #: wizard_button:auction.lots.send.aie.results,date_ask,send:0
 msgid "Send on your website"
-msgstr ""
+msgstr "发送到你的网站"
 
 #. module: auction
 #: field:auction.lots,net_margin:0
 msgid "Net Margin (%)"
-msgstr ""
+msgstr "净利润(%)"
 
 #. module: auction
 #: field:report.auction.object.date,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.auction_lots_open
@@ -1718,82 +1761,89 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_view
 msgid "Auction Reporting on view1"
-msgstr ""
+msgstr "拍卖报表视图1"
 
 #. module: auction
 #: field:report.seller.auction2,sum_adj:0
 msgid "Sum Adjustication"
-msgstr ""
+msgstr "最终结果合计"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Porcelain, Ceramics, Glassmaking, ..."
-msgstr ""
+msgstr "古董/ 瓷器, 陶器, 玻璃工艺品"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
 msgid "Plate Number:"
-msgstr ""
+msgstr "版号:"
 
 #. module: auction
-#: view:auction.deposit:0 field:auction.deposit,lot_id:0
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
-msgstr "对象"
+msgstr "物品"
 
 #. module: auction
 #: wizard_view:auction.lots.numerotate,init:0
 #: wizard_view:auction.lots.numerotate,search:0
 msgid "Object Reference"
-msgstr ""
+msgstr "物品参考"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Paid:"
-msgstr ""
+msgstr "已付："
 
 #. module: auction
 #: field:auction.deposit,total_neg:0
 msgid "Allow Negative Amount"
-msgstr ""
+msgstr "允许负数金额"
 
 #. module: auction
-#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
+#: rml:auction.bids:0
+#: view:auction.lots:0
+#: rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
-msgstr ""
+msgstr "拍卖"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Cont. Art/Shows"
-msgstr ""
+msgstr "艺术品/ 展示"
 
 #. module: auction
-#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0
+#: field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0
+#: field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0
+#: field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0
+#: field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0
+#: field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
-msgstr ""
+msgstr "拍卖日期"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_all_objects_unsold
 msgid "Unsold Objects"
-msgstr ""
+msgstr "未售出物品"
 
 #. module: auction
 #: field:report.buyer.auction,avg_price:0
 msgid "Avg Adj."
-msgstr ""
+msgstr "平均最终结果"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_deposit_cost
@@ -1803,17 +1853,17 @@ msgstr ""
 #. module: auction
 #: wizard_field:auction.lots.numerotate,search,bord_vnd_id:0
 msgid "Object Inventory"
-msgstr ""
+msgstr "物品目录"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Art from the Ivory Coast/African Arts"
-msgstr ""
+msgstr "古董/ 象牙海岸艺术品/ 非洲艺术品"
 
 #. module: auction
 #: field:auction.dates,auction1:0
 msgid "First Auction Day"
-msgstr ""
+msgstr "首日拍卖"
 
 #. module: auction
 #: view:report.attendance:0
@@ -1823,68 +1873,67 @@ msgstr ""
 #. module: auction
 #: view:auction.lot.category:0
 msgid "Lot Category"
-msgstr ""
+msgstr "批类别"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_manager_menu
 msgid "Manager"
-msgstr ""
+msgstr "经理"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Names"
-msgstr ""
+msgstr "名称"
 
 #. module: auction
 #: view:auction.artists:0
 msgid "Artists"
-msgstr ""
+msgstr "艺术家"
 
 #. module: auction
 #: field:report.attendance,total_attendance:0
-#: xsl:report.auction.ach_bordereau:0
 msgid "Total"
-msgstr ""
+msgstr "合计"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
 msgid "Open lots"
-msgstr ""
+msgstr "打开批"
 
 #. module: auction
 #: view:report.seller.auction:0
 msgid "Auction reporting form view"
-msgstr ""
+msgstr "拍卖报表表格视图"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Lots"
-msgstr ""
+msgstr "批"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_send
 msgid "Send to website"
-msgstr ""
+msgstr "发送到网站"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_old
 msgid "Old Auction Dates"
-msgstr ""
+msgstr "旧拍卖日期"
 
 #. module: auction
 #: field:auction.lots,seller_price:0
 msgid "Seller price"
-msgstr ""
+msgstr "卖家价格"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_seller_auction2
 msgid "Auction Reporting on seller view2"
-msgstr ""
+msgstr "拍卖视图卖家视图2"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.buy_id_list
 msgid "Buyer List"
-msgstr ""
+msgstr "买家列表"
 
 #. module: auction
 #: rml:buyer.list:0
@@ -1896,12 +1945,12 @@ msgstr ""
 #: wizard_field:auction.pay.buy,init,statement_id2:0
 #: wizard_field:auction.pay.buy,init,statement_id3:0
 msgid "Statement"
-msgstr ""
+msgstr "对帐单"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Engravings"
-msgstr ""
+msgstr "古董/ 版画"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax20
@@ -1913,7 +1962,7 @@ msgstr ""
 #: wizard_view:auction.lots.numerotate_cont,init:0
 #: wizard_field:auction.lots.numerotate_cont,init,number:0
 msgid "First Number"
-msgstr ""
+msgstr "第一编号"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax
@@ -1923,27 +1972,28 @@ msgstr ""
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_view2
 msgid "Auction Reporting on  view2"
-msgstr ""
+msgstr "拍卖报表视图2"
 
 #. module: auction
 #: field:auction.dates,expo1:0
 msgid "First Exposition Day"
-msgstr ""
+msgstr "展览会首日"
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid "Warning, this will erase the object adjudication price and its buyer !"
-msgstr ""
+msgid ""
+"Warning, this will erase the object adjudication price and its buyer !"
+msgstr "警告, 这将删除物品的最终结果和它的买家"
 
 #. module: auction
 #: field:report.auction.object.date,name:0
 msgid "Created date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: auction
 #: view:auction.bid:0
 msgid "Bid information"
-msgstr ""
+msgstr "出价信息"
 
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
@@ -1953,111 +2003,115 @@ msgstr ""
 #. module: auction
 #: field:auction.dates,acc_income:0
 msgid "Income Account"
-msgstr ""
+msgstr "收入科目"
 
 #. module: auction
-#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0
+#: field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
-msgstr ""
+msgstr "净收入"
 
 #. module: auction
-#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
-msgstr ""
+msgstr "极限"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree_manager
 msgid "Latest Deposits"
-msgstr ""
+msgstr "最近押金"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of items:"
-msgstr ""
+msgstr "# 项"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Musical Instruments"
-msgstr ""
+msgstr "古董/ 乐器"
 
 #. module: auction
 #: field:report.object.encoded,estimation:0
 #: field:report.object.encoded.manager,estimation:0
 msgid "Estimation"
-msgstr ""
+msgstr "估价"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Graphic Arts"
-msgstr ""
+msgstr "古董/ 印艺"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.buyer_form_id
 msgid "Buyer Form"
-msgstr ""
+msgstr "买家表格"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_invoice
 msgid "Invoice Seller objects"
-msgstr ""
+msgstr "发票卖家物品"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Oriental Arts"
-msgstr ""
+msgstr "古董/ 东方艺术"
 
 #. module: auction
 #: field:auction.bid,partner_id:0
 msgid "Buyer Name"
-msgstr ""
+msgstr "买家姓名"
 
 #. module: auction
 #: field:report.auction.view2,sum_adj:0
 msgid "Sum of adjudication"
-msgstr ""
+msgstr "最终结果合计"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_enable_taken
 msgid "Unmark as taken away"
-msgstr ""
+msgstr "取消带走标记"
 
 #. module: auction
 #: field:auction.lots,gross_margin:0
 msgid "Gross Margin (%)"
-msgstr ""
+msgstr "毛利(%)"
 
 #. module: auction
 #: selection:auction.dates,state:0
 #: selection:report.auction.adjudication,state:0
 msgid "Closed"
-msgstr ""
+msgstr "关闭"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0
+#: field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
-msgstr ""
+msgstr "佣金"
 
 #. module: auction
 #: wizard_field:auction.lots.numerotate,init,lot_num:0
 msgid "Lot Number"
-msgstr ""
+msgstr "批号"
 
 #. module: auction
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "这增值税似乎不正确"
 
 #. module: auction
 #: field:report.attendance,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "员工"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
-msgstr ""
+msgstr "最终结果(EUR)"
 
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
@@ -2072,17 +2126,17 @@ msgstr "报表"
 #. module: auction
 #: view:auction.lots:0
 msgid "Catalog"
-msgstr ""
+msgstr "目录"
 
 #. module: auction
 #: field:auction.deposit.cost,account:0
 msgid "Destination Account"
-msgstr ""
+msgstr "目标帐号"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_deposit_border
 msgid "Report deposit border"
-msgstr ""
+msgstr "报告押金边界"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_config_menu
@@ -2097,19 +2151,19 @@ msgstr ""
 #. module: auction
 #: field:auction.deposit.cost,deposit_id:0
 msgid "Deposit"
-msgstr ""
+msgstr "押金"
 
 #. module: auction
 #: field:auction.dates,expo2:0
 msgid "Last Exposition Day"
-msgstr ""
+msgstr "最后展览会日期"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_report_allmonth_view1
 #: model:ir.actions.act_window,name:auction.action_auction_report_allmonth_view2
 #: model:ir.actions.act_window,name:auction.action_auction_report_thismonth_view2
 msgid "Auction report"
-msgstr ""
+msgstr "拍卖报表"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_category
@@ -2119,63 +2173,65 @@ msgstr ""
 #. module: auction
 #: field:auction.artists,name:0
 msgid "Artist/Author Name"
-msgstr ""
+msgstr "艺术家/ 作者姓名"
 
 #. module: auction
 #: field:auction.lots,image:0
 msgid "Image"
-msgstr ""
+msgstr "图像"
 
 #. module: auction
 #: selection:report.object.encoded,state:0
 msgid "Invoiced"
-msgstr ""
+msgstr "已开票"
 
 #. module: auction
-#: view:auction.lots:0 selection:auction.lots,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
 msgid "Taken away"
-msgstr ""
+msgstr "带走"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Collectible & art objects"
-msgstr ""
+msgstr "古董/ 收藏品&艺术品"
 
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
 msgid "BID:"
-msgstr ""
+msgstr "出价:"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting
 #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting2
 #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all1
 msgid "Buyer's auction"
-msgstr ""
+msgstr "买家拍卖"
 
 #. module: auction
 #: view:report.seller.auction2:0
 msgid "Auction reporting2 tree view"
-msgstr ""
+msgstr "拍卖报表2树视图"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Deposit Costs"
-msgstr ""
+msgstr "押金成本"
 
 #. module: auction
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "错误！您不能创建递归的相关成员。"
 
 #. module: auction
-#: selection:auction.dates,state:0 selection:auction.lots,state:0
+#: selection:auction.dates,state:0
+#: selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: auction
 #: rml:buyer.list:0
@@ -2185,37 +2241,38 @@ msgstr ""
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
 msgid "Buyer Cost:"
-msgstr ""
+msgstr "买家费用:"
 
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
 msgid "NET"
-msgstr ""
+msgstr "净值"
 
 #. module: auction
 #: rml:report.auction.buyer.result:0
 msgid "Adj"
-msgstr ""
+msgstr "最终结果"
 
 #. module: auction
-#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0
+#: model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
-msgstr ""
+msgstr "拍卖日期"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Furnitures"
-msgstr ""
+msgstr "古董/ 家具"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
 msgid "Customer Contact"
-msgstr ""
+msgstr "客户联系"
 
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Inv, Name"
-msgstr ""
+msgstr "发票名称"
 
 #. module: auction
 #: field:report.auction.adjudication,user_id:0
@@ -2224,38 +2281,38 @@ msgstr ""
 #: field:report.object.encoded,user_id:0
 #: field:report.object.encoded.manager,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: auction
 #: view:report.unplanned.object:0
 msgid "Unplanned Objects"
-msgstr ""
+msgstr "无计划的物品"
 
 #. module: auction
 #: field:report.buyer.auction2,gross_revenue:0
 msgid "Gross Revenue"
-msgstr ""
+msgstr "总收入"
 
 #. module: auction
 #: field:auction.artists,pseudo:0
 msgid "Pseudo"
-msgstr ""
+msgstr "赝品"
 
 #. module: auction
 #: field:auction.lots,important:0
 msgid "To be Emphatized"
-msgstr ""
+msgstr "加强"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Not sold"
-msgstr ""
+msgstr "未售出"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax3
 #: field:auction.dates,buyer_costs:0
 msgid "Buyer Costs"
-msgstr ""
+msgstr "买家费用"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_numerotate_automatic
@@ -2265,27 +2322,27 @@ msgstr ""
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Auction Date:"
-msgstr ""
+msgstr "拍卖日期:"
 
 #. module: auction
 #: field:auction.lots,ach_inv_id:0
 msgid "Buyer Invoice"
-msgstr ""
+msgstr "买家发票"
 
 #. module: auction
 #: rml:auction.bids:0
 msgid "Tel"
-msgstr ""
+msgstr "Tel"
 
 #. module: auction
 #: wizard_field:auction.pay.buy,init,total:0
 msgid "Amount to paid"
-msgstr ""
+msgstr "支付金额"
 
 #. module: auction
 #: field:auction.lots,artist_id:0
 msgid "Artist/Author"
-msgstr ""
+msgstr "艺术家/ 作者"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax1
@@ -2295,12 +2352,12 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.total_result1
 msgid "Auction Totals with lists"
-msgstr ""
+msgstr "拍卖列表合计"
 
 #. module: auction
 #: wizard_button:auction.lots.buyer_map,done,end:0
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_object_encoded
@@ -2316,62 +2373,63 @@ msgstr ""
 #. module: auction
 #: field:report.auction.view,nbuyer:0
 msgid "No of buyers"
-msgstr ""
+msgstr "没买家"
 
 #. module: auction
 #: field:report.seller.auction,avg_price:0
 msgid "Avg adjudication"
-msgstr ""
+msgstr "平均最终结果"
 
 #. module: auction
 #: view:report.object.encoded.manager:0
 msgid "Object statistic"
-msgstr ""
+msgstr "物品统计"
 
 #. module: auction
 #: field:auction.dates,auction2:0
 msgid "Last Auction Day"
-msgstr ""
+msgstr "最后拍卖日"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_next1
 msgid "Next Auction Dates"
-msgstr ""
+msgstr "下一个拍卖日"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_attendance
 msgid "Report Sign In/Out"
-msgstr ""
+msgstr "报告登进/ 登出"
 
 #. module: auction
-#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0 xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Cont. Art/Arts"
-msgstr ""
+msgstr "艺术品/ 艺术家"
 
 #. module: auction
-#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0
+#: field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
-msgstr ""
+msgstr "最终结果价格"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_all_objects_to_sell
 msgid "Objects to sell"
-msgstr ""
+msgstr "物品销售"
 
 #. module: auction
 #: xsl:flagey.huissier:0
 msgid "Ref."
-msgstr ""
+msgstr "参考"
 
 #. module: auction
 #: wizard_field:auction.lots.send.aie,date_ask,password:0
@@ -2380,115 +2438,116 @@ msgstr ""
 #: wizard_field:auction.lots.send.aie.results,init,password:0
 #: wizard_field:auction.lots.sms_send,init,password:0
 msgid "Password"
-msgstr ""
+msgstr "密码"
 
 #. module: auction
 #: field:auction.lots,ach_avance:0
 msgid "Buyer Advance"
-msgstr ""
+msgstr "买家进展"
 
 #. module: auction
 #: field:auction.lots,name:0
 #: wizard_field:auction.lots.numerotate,search,name:0
 #: field:report.unclassified.objects,name:0
 msgid "Short Description"
-msgstr ""
+msgstr "简短说明"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_employees_menu
 msgid "Employees"
-msgstr ""
+msgstr "员工"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Clocks and watches"
-msgstr ""
+msgstr "古董/ 钟表"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Scientific Instruments"
-msgstr ""
+msgstr "古董/ 科学仪器"
 
 #. module: auction
 #: wizard_view:auction.lots.enable,init:0
 msgid "Confirmation enable taken away"
-msgstr ""
+msgstr "设置允许带走"
 
 #. module: auction
 #: wizard_view:auction.pay.buy,init:0
 msgid "Pay objects"
-msgstr ""
+msgstr "物品付款"
 
 #. module: auction
-#: view:report.object.encoded:0 view:report.object.encoded.manager:0
+#: view:report.object.encoded:0
+#: view:report.object.encoded.manager:0
 msgid "# objects"
-msgstr ""
+msgstr "# 物品"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Adjudication:"
-msgstr ""
+msgstr "最终结果:"
 
 #. module: auction
 #: field:report.buyer.auction2,sumadj:0
 msgid "Sum of adjustication"
-msgstr ""
+msgstr "最终结果总计"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.details_bids_phones
 msgid "Bids per lot (phone)"
-msgstr ""
+msgstr "每次出价(电话)"
 
 #. module: auction
 #: field:report.buyer.auction,buyer_login:0
 #: field:report.buyer.auction2,buyer_login:0
 msgid "Buyer Login"
-msgstr ""
+msgstr "买家登录"
 
 #. module: auction
 #: field:auction.deposit,tax_id:0
 msgid "Expenses"
-msgstr ""
+msgstr "费用"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Wine"
-msgstr ""
+msgstr "古董/ 酒"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Auction name:"
-msgstr ""
+msgstr "拍卖名称:"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/African Arts"
-msgstr ""
+msgstr "古董/ 非洲艺术"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.art2
 msgid "Artists Biography"
-msgstr ""
+msgstr "艺术家简历"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Posters"
-msgstr ""
+msgstr "古董/ 海报"
 
 #. module: auction
 #: field:auction.lots,history_ids:0
 msgid "Auction history"
-msgstr ""
+msgstr "拍卖日志"
 
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
-msgstr ""
+msgstr "订单"
 
 #. module: auction
 #: view:board.board:0
 msgid "Objects by day"
-msgstr "天物品"
+msgstr "每天物品"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction_manager
@@ -2498,7 +2557,7 @@ msgstr "拍卖管理"
 #. module: auction
 #: view:board.board:0
 msgid "Summary pointing by user"
-msgstr "每用户摘要指示"
+msgstr "用户摘要"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction
@@ -2523,7 +2582,7 @@ msgstr "拍卖控制台"
 #. module: auction
 #: view:board.board:0
 msgid "Estimations/Adjudication"
-msgstr "评价/最终结果"
+msgstr "估价/ 最终结果"
 
 #. module: auction
 #: view:board.board:0
@@ -2563,9 +2622,13 @@ msgstr "拍卖管理控制台"
 #. module: auction
 #: view:board.board:0
 msgid "Min/Adj/Max"
-msgstr "最少/邻近/最大"
+msgstr "最少/ 最终结果/ 最大"
 
 #. module: auction
 #: view:board.board:0
 msgid "My Latest Objects"
-msgstr "我最后的物品"
+msgstr "我最近的物品"
+
+#, python-format
+#~ msgid "The Buyer \"%s\" has no Invoice Address."
+#~ msgstr "نىڭ رۇخسەت ئادېرىسى يوق \"%s\" ساتقۇچى تەرەپ"
diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py
index 7ec81b4eb7e..e660b418aa3 100644
--- a/addons/audittrail/__openerp__.py
+++ b/addons/audittrail/__openerp__.py
@@ -32,7 +32,7 @@
     Administrator can subscribe rules for read,write and
     delete on objects and can check logs.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 17b2594d470..218db24d89a 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -37,7 +37,7 @@
             <field name="model">audittrail.rule</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="AuditTrail Rules">
+                <tree colors="blue:state in ('draft');black:state in ('subscribed')" string="AuditTrail Rules">
                     <field name="name" />
                     <field name="object_id"/>
                     <field name="user_id" />
@@ -157,7 +157,7 @@
             <field name="view_type">form</field>
         </record>
         <menuitem name="Logs" id="menu_action_audittrail_log_tree"
-            action="action_audittrail_log_tree" parent="menu_action_audittrail" />       
+            action="action_audittrail_log_tree" parent="menu_action_audittrail" />
 
     </data>
 </openerp>
diff --git a/addons/audittrail/i18n/pt_BR.po b/addons/audittrail/i18n/pt_BR.po
index b3ab5532ca8..678303551ce 100644
--- a/addons/audittrail/i18n/pt_BR.po
+++ b/addons/audittrail/i18n/pt_BR.po
@@ -7,19 +7,19 @@ 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"
-"PO-Revision-Date: 2010-01-20 01:10+0000\n"
-"Last-Translator: pedrobom <pedrobomlimeira@gmail.com>\n"
+"PO-Revision-Date: 2010-07-28 13:21+0000\n"
+"Last-Translator: Leandro Chaves <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-06-22 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
 msgid "Audit Trail"
-msgstr ""
+msgstr "Trilha de Auditoria"
 
 #. module: audittrail
 #: constraint:ir.model:0
@@ -62,7 +62,7 @@ msgstr "Status"
 #. module: audittrail
 #: selection:audittrail.rule,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Provisório"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
@@ -77,12 +77,12 @@ msgstr "Nome de modelo inválido na definição da ação."
 #. module: audittrail
 #: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
 msgid "View log"
-msgstr ""
+msgstr "Ver log"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
 msgid "audittrail.log.line"
-msgstr ""
+msgstr "audittrail.log.line"
 
 #. module: audittrail
 #: field:audittrail.log,method:0
@@ -92,7 +92,7 @@ msgstr "Método"
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,from:0
 msgid "Log From"
-msgstr ""
+msgstr "Log de"
 
 #. module: audittrail
 #: field:audittrail.log.line,log:0
@@ -112,7 +112,7 @@ msgstr "Escrever"
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail
 msgid "Audittrails"
-msgstr ""
+msgstr "Trilhas de Auditoria"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -138,17 +138,17 @@ msgstr "Objeto"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rule"
-msgstr ""
+msgstr "Regra de Trilha de Auditoria"
 
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,to:0
 msgid "Log To"
-msgstr ""
+msgstr "'Logar' no"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value Text: "
-msgstr ""
+msgstr "Texto do Novo Valor: "
 
 #. module: audittrail
 #: model:ir.module.module,description:audittrail.module_meta_information
@@ -158,6 +158,10 @@ msgid ""
 "    Subscribe Rules for read, write, create and delete on objects and check "
 "logs"
 msgstr ""
+"Permite ao administrador acompanhar cada operação de cada usuário em todos "
+"objetos do sistema.\n"
+"    Inscreva Regras para leitura, escrita e apagar nos objetos e marque os "
+"logs"
 
 #. module: audittrail
 #: field:audittrail.log,timestamp:0
@@ -172,7 +176,7 @@ msgstr "Usuário"
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value Text : "
-msgstr ""
+msgstr "Texto do Valor Anterior "
 
 #. module: audittrail
 #: constraint:ir.ui.view:0
@@ -272,7 +276,7 @@ msgstr "Ver Logs"
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
 msgid "Log creates"
-msgstr ""
+msgstr "Criações de Logs"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -307,4 +311,4 @@ msgstr "Cancelar"
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log deletes"
-msgstr ""
+msgstr "Eliminações do Log"
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 6573c20e894..b554277f990 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:34+0000\n"
+"PO-Revision-Date: 2010-07-15 17:26+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-06-22 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-07-16 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
@@ -35,7 +35,7 @@ msgstr "日志"
 #. module: audittrail
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr "订阅"
+msgstr "已订阅"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -105,7 +105,7 @@ msgstr "资源ID"
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Write"
-msgstr "写"
+msgstr "写入"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index cdb62316d15..7891f6e3ae2 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Others',
     'description': "This module allows to implement action rules for any object.",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index f7f6f8bf3d0..d2c238f81e4 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -60,7 +60,8 @@ class base_action_rule(osv.osv):
         return [('', '')]
 
     _columns = {
-        'name': fields.many2one('ir.model', 'Object', required=True), 
+        'name':  fields.char('Rule Name', size=64, required=True), 
+        'model_id': fields.many2one('ir.model', 'Object', required=True), 
         'create_date': fields.datetime('Create Date', readonly=1), 
         'active': fields.boolean('Active', help="If the active field is set to False,\
  it will allow you to hide the rule without removing it."), 
@@ -124,10 +125,22 @@ the rule to mark CC(mail to any other person defined in actions)."),
     
     _order = 'sequence'
     
+    def onchange_model_id(self, cr, uid, ids, name):
+        #This is not a good solution as it will affect the domain only on onchange
+        res = {'domain':{'filter_id':[]}}
+        if name:
+            model_name = self.pool.get('ir.model').read(cr, uid, [name], ['model'])
+            if model_name:
+                mod_name = model_name[0]['model']
+                res['domain'] = {'filter_id': [('model_id','=',mod_name)]}
+        else:
+            res['value'] = {'filter_id':False}
+        return res
+
     def pre_action(self, cr, uid, ids, model, context=None):
         # Searching for action rules
         cr.execute("SELECT model.model, rule.id  FROM base_action_rule rule \
-                        LEFT JOIN ir_model model on (model.id = rule.name) \
+                        LEFT JOIN ir_model model on (model.id = rule.model_id) \
                         where active")
         res = cr.fetchall()
         # Check if any rule matching with current object
@@ -164,7 +177,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
         if not context:
             context = {}
         for action_rule in self.browse(cr, uid, ids, context=context):
-            model = action_rule.name.model
+            model = action_rule.model_id.model
             obj_pool = self.pool.get(model)
             obj_pool.__setattr__('create', self._create(obj_pool.create, model, context=context))
             obj_pool.__setattr__('write', self._write(obj_pool.write, model, context=context))
@@ -246,7 +259,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
             @param context: A standard dictionary for contextual values """
         ok = True 
         if action.filter_id:
-            if action.name.model == action.filter_id.model_id:
+            if action.model_id.model == action.filter_id.model_id:
                 context.update(eval(action.filter_id.context))
                 obj_ids = obj._table.search(cr, uid, eval(action.filter_id.domain), context=context)
                 if not obj.id in obj_ids:
@@ -344,24 +357,24 @@ 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):
-            model_obj = self.pool.get(action.name.model)
+            model_obj = self.pool.get(action.model_id.model)
             for obj in objects:
                 ok = self.do_check(cr, uid, action, obj, context=context)
                 if not ok:
                     continue
 
                 base = False
-                if hasattr(obj, 'create_date') and action.trg_date_type=='create':
+                if action.trg_date_type=='create' and hasattr(obj, 'create_date'):
                     base = datetime.strptime(obj.create_date[:19], '%Y-%m-%d %H:%M:%S')
-                elif hasattr(obj, 'create_date') and action.trg_date_type=='action_last':
+                elif action.trg_date_type=='action_last' and hasattr(obj, 'create_date'):
                     if hasattr(obj, 'date_action_last') and obj.date_action_last:
                         base = datetime.strptime(obj.date_action_last, '%Y-%m-%d %H:%M:%S')
                     else:
                         base = datetime.strptime(obj.create_date[:19], '%Y-%m-%d %H:%M:%S')
-                elif hasattr(obj, 'date_deadline') and action.trg_date_type=='deadline' \
+                elif action.trg_date_type=='deadline' and hasattr(obj, 'date_deadline') \
                                 and obj.date_deadline:
                     base = datetime.strptime(obj.date_deadline, '%Y-%m-%d %H:%M:%S')
-                elif hasattr(obj, 'date') and action.trg_date_type=='date' and obj.date:
+                elif action.trg_date_type=='date' and hasattr(obj, 'date') and obj.date:
                     base = datetime.strptime(obj.date, '%Y-%m-%d %H:%M:%S')
                 if base:
                     fnct = {
diff --git a/addons/base_action_rule/base_action_rule_data.xml b/addons/base_action_rule/base_action_rule_data.xml
index 288215202d6..7a9aabedf5f 100644
--- a/addons/base_action_rule/base_action_rule_data.xml
+++ b/addons/base_action_rule/base_action_rule_data.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-		<record id="ir_cron_crm_action" model="ir.cron">
+
+        <record id="ir_cron_crm_action" model="ir.cron">
             <field name="name">Check Action Rules</field>
             <field name="interval_number">4</field>
             <field name="interval_type">hours</field>
@@ -10,10 +11,7 @@
             <field eval="'base.action.rule'" name="model"/>
             <field eval="'_check'" name="function"/>
             <field eval="'()'" name="args"/>
-        </record>      
-        
-        
-        
-                
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index ef0b70ebdc2..710fc9d0075 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_base_action_rule" name="Action Rule"
+        <menuitem id="base.menu_base_action_rule" name="Automated Actions"
             groups="base.group_extended"
-            parent="base.menu_base_config" sequence="0" />
+            parent="base.menu_base_config" sequence="3" />
 
         <!--
             Action Rule Form View
@@ -14,10 +14,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Action Rule">
-                    <field name="name" select="1"/>
-                    <field name="active"/>
+                    <field name="name"/>
+                    <field name="model_id" select="1" on_change="onchange_model_id(model_id)"/>
+                    <field name="filter_id" />
                     <field name="sequence"/>
-                    <field name="filter_id"/>
+                    <field name="active"/>
                     <notebook colspan="4">
                         <page string="Conditions">
                             <group col="2" colspan="2" name="model">
@@ -104,7 +105,7 @@
 <!-- Action Rule Action -->
 
            <record id="base_action_rule_act" model="ir.actions.act_window">
-            <field name="name">Action Rules</field>
+            <field name="name">Automated Actions</field>
             <field name="res_model">base.action.rule</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -112,7 +113,7 @@
         </record>
 
            <menuitem id="menu_base_action_rule_form"
-               parent="menu_base_action_rule" action="base_action_rule_act" />
+               parent="base.menu_base_action_rule" action="base_action_rule_act" sequence="1"/>
 
 
     </data>
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 2d18f675c6f..65afc868604 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -28,7 +28,7 @@
     - Alerts (create requests)
     - Recurring events
     - Invitations to people""",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     'category': 'Generic Modules/Others',
     'website': 'http://www.openerp.com',
     "init_xml" : [
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index a8cdba58975..241a36b1051 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1092,7 +1092,7 @@ class calendar_event(osv.osv):
                         ('confirmed', 'Confirmed'),
                         ('cancelled', 'Cancelled')], 'State', readonly=True),
         'exdate': fields.text('Exception Date/Times', help="This property \
-defines the list of date/time exceptions for arecurring calendar component."),
+defines the list of date/time exceptions for a recurring calendar component."),
         'exrule': fields.char('Exception Rule', size=352, help="defines a \
 rule or repeating pattern for an exception to a recurrence set"),
         'rrule': fields.function(_get_rulestring, type='char', size=124, method=True, \
@@ -1147,7 +1147,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         'active': fields.boolean('Active', help="If the active field is set to \
 true, it will allow you to hide the event alarm information without removing it.")
     }
-
     _defaults = {
             'state': 'tentative',
             'class': 'public',
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index cb2ca806afa..2324be6adbd 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -77,11 +77,11 @@
             <field name="arch" type="xml">
                 <tree string="Invitation details">
                     <field name="sent_by_uid" string="Invitation From" />
-                    <field name="role" string="My Role"/>                    
+                    <field name="role" string="My Role"/>
                     <field name="cutype" string="Invitation type"/>
                     <field name="state" />
                     <field name="rsvp" string="Required to Join"/>
-                    <button name="do_tentative" states="needs-action,declined,accepted"                                
+                    <button name="do_tentative" states="needs-action,declined,accepted"
                                 string="Uncertain" type="object"
                                 icon="terp-crm" />
                     <button name="do_accept" string="Accept"
@@ -108,12 +108,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
+                   <filter icon="terp-camera_test" name="toreview" string="To Review"
+                       domain="[('state','=', 'needs-action')]"
+                       separator="1" help="Invitations To Review" />
                    <filter icon="terp-check" string="Accepted"
                        domain="[('state','=', 'accepted')]"
                        separator="1" help="Accepted Invitations" />
                    <filter icon="terp-dialog-close" string="Declined"
                        domain="[('state','=', 'declined')]"
                        separator="1" help="Declined Invitations" />
+                   <filter icon="gtk-sort-descending" string="Delegated"
+                       domain="[('state','=', 'delegated')]"
+                       separator="1" help="Delegated Invitations" />
                    <separator orientation="vertical"/>
                    <field name="email" select='1'/>
                    <field name="user_id" select="1"/>
@@ -151,7 +157,7 @@
 
         <!-- Calenadar's menu -->
           <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_base_config" sequence="15" />
+            parent="base.menu_base_config" sequence="6" />
 
         <!-- Invitation menu -->
 
@@ -195,7 +201,7 @@
             </field>
         </record>
         <record id="action_res_alarm_view" model="ir.actions.act_window">
-            <field name="name">Available Alarms</field>
+            <field name="name">Alarms</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.alarm</field>
             <field name="view_type">form</field>
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index 8c58d44ff4c..7aa210fd0bf 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -38,7 +38,7 @@
 
     Pay attention that this module converts the existing addresses into "addresses + contacts". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base','process'],
     'init_xml': [],
diff --git a/addons/base_contact/base_contact_installer.py b/addons/base_contact/base_contact_installer.py
index 3cb32017111..e1ed709dd11 100644
--- a/addons/base_contact/base_contact_installer.py
+++ b/addons/base_contact/base_contact_installer.py
@@ -25,41 +25,44 @@ from osv import fields, osv
 class base_contact_installer(osv.osv_memory):
     _name = 'base.contact.installer'
     _inherit = 'res.config.installer'
-    
+
     _columns = {
-        'name': fields.char('Name', size=64), 
-        'migrate': fields.boolean('Migrate', help="If you select this, all addresses will be migrated."), 
+        'name': fields.char('Name', size=64),
+        'migrate': fields.boolean('Migrate', help="If you select this, all addresses will be migrated."),
+        'nomigrate': fields.boolean('NoMigrate', help="If you select this, all addresses will be not migrated."),
     }
 
     def execute(self, cr, uid, ids, context=None):
         """
-        This function is used to create contact and address from existing partner address 
+        This function is used to create contact and address from existing partner address
         """
-        cr.execute("""DROP TRIGGER  IF EXISTS contactjob on res_partner_contact;
-                        DROP LANGUAGE  IF EXISTS  plpgsql CASCADE;
-                        CREATE LANGUAGE plpgsql ;
-                        CREATE OR REPLACE FUNCTION add_to_job() RETURNS TRIGGER AS $contactjob$
-                        DECLARE
-                        new_name varchar;
-                        new_phonenum varchar;
-                        BEGIN
-                        IF(TG_OP='INSERT') THEN
-                        INSERT INTO res_partner_job(contact_id, address_id, function, state) VALUES(NEW.id, NEW.website::integer,NEW.first_name, 'current');
-                        UPDATE res_partner_contact set first_name=Null, website=Null, active=True where id=NEW.id;
-                        END IF;
-                        RETURN NEW;
-                        END;
-                        $contactjob$ LANGUAGE plpgsql;
-                        CREATE TRIGGER contactjob AFTER INSERT ON res_partner_contact FOR EACH ROW EXECUTE PROCEDURE add_to_job();""")
-        cr.commit()
+        obj = self.pool.get("base.contact.installer").browse(cr, uid, uid)
+        if obj.migrate:
+            cr.execute("""DROP TRIGGER  IF EXISTS contactjob on res_partner_contact;
+                            DROP LANGUAGE  IF EXISTS  plpgsql CASCADE;
+                            CREATE LANGUAGE plpgsql ;
+                            CREATE OR REPLACE FUNCTION add_to_job() RETURNS TRIGGER AS $contactjob$
+                            DECLARE
+                            new_name varchar;
+                            new_phonenum varchar;
+                            BEGIN
+                            IF(TG_OP='INSERT') THEN
+                            INSERT INTO res_partner_job(contact_id, address_id, function, state) VALUES(NEW.id, NEW.website::integer,NEW.first_name, 'current');
+                            UPDATE res_partner_contact set first_name=Null, website=Null, active=True where id=NEW.id;
+                            END IF;
+                            RETURN NEW;
+                            END;
+                            $contactjob$ LANGUAGE plpgsql;
+                            CREATE TRIGGER contactjob AFTER INSERT ON res_partner_contact FOR EACH ROW EXECUTE PROCEDURE add_to_job();""")
+            cr.commit()
 
-        cr.execute("INSERT into res_partner_contact (name, title, email, first_name, website)  (SELECT coalesce(name, 'Noname'), title, email, function , to_char(id, '99999999') from res_partner_address)")
-        cr.commit()
+            cr.execute("INSERT into res_partner_contact (name, title, email, first_name, website)  (SELECT coalesce(name, 'Noname'), title, email, function , to_char(id, '99999999') from res_partner_address)")
+            cr.commit()
 
-        cr.execute("DROP TRIGGER  IF EXISTS contactjob  on res_partner_contact")
-        cr.execute("DROP LANGUAGE  IF EXISTS  plpgsql CASCADE;")
-        cr.execute("DROP FUNCTION IF EXISTS  add_to_job()")
-        cr.commit()
+            cr.execute("DROP TRIGGER  IF EXISTS contactjob  on res_partner_contact")
+            cr.execute("DROP LANGUAGE  IF EXISTS  plpgsql CASCADE;")
+            cr.execute("DROP FUNCTION IF EXISTS  add_to_job()")
+            cr.commit()
 
 base_contact_installer()
 
diff --git a/addons/base_contact/base_contact_installer_view.xml b/addons/base_contact/base_contact_installer_view.xml
index 3d93faa5728..646d3918e9f 100644
--- a/addons/base_contact/base_contact_installer_view.xml
+++ b/addons/base_contact/base_contact_installer_view.xml
@@ -23,14 +23,18 @@
                         <attribute name='string'></attribute>
                     </xpath>
                     <xpath expr="//button[@string='Install Modules']" position="attributes">
-                        <attribute name="string">Migrate</attribute>
+                        <attribute name="string">Configure</attribute>
                     </xpath>
                     <group colspan="8">
                         <group colspan="2" col="2">
                             <label string="Due to changes in Address and Partner's relation, some of the details from address are needed to migrated into contact information." colspan="4"/>
                             <label string="Otherwise these details will not be visible from address/contact."  colspan="4"/>
                             <label string="Do you want to migrate your Address data in Contact Data?" colspan="4" />
-                            <field name="migrate" string="Yes/No" />
+                            <group colspan="6">
+                                <label string="Migrate:" colspan="1"/>
+                                <field name="migrate" string="Yes" colspan="1"/>
+                                <field name="nomigrate" string="No" colspan="1"/>
+                            </group>
                         </group>
                     </group>
                 </data>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index c336b3e35fe..a251ca6eb90 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -72,8 +72,8 @@
                             <tree string="Functions and Addresses">
                                 <field name="sequence_contact" string="Seq."/>
                                 <field name="function"/>
-                                <field name="name"/>
-                                <field name="address_id"/>
+                                <field name="name" on_change="onchange_partner(name)"/> 
+								<field name="address_id" attrs="{'required': [('name', '!=', False)]}" on_change="onchange_address(address_id)"/>
                                 <field name="phone"/>
                                 <field name="fax"/>
                                 <field name="extension"/>
@@ -180,7 +180,6 @@
                             <form string="Contacts">
                             <group colspan="4" col="4">
                                 <field name="sequence_partner"/>
-                                <field name="name"/>
                                 <field name="contact_id"/>
                                 <field name="function"/>
                             </group>
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index 0d03f320362..396f2deeae2 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/i18n/lt.po
@@ -1,43 +1,43 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_contact
-#
+# * base_contact
+# Giedrius Slavinskas <giedrius.slavinskas@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-18 05:58+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-07-21 07:52+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-06-22 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: lt\n"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr "Kontaktų seka"
+msgstr "Kontakto seka"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
 msgid "res.partner.contact"
-msgstr "res.partner.contact"
+msgstr "Partnerių kontaktai"
 
 #. module: base_contact
 #: 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ų "
-"simbolių!"
+"Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių !"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
 msgid "Partner Function"
-msgstr ""
+msgstr "Partnerio pareigos"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -52,7 +52,7 @@ msgstr "Kontaktai"
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr "Partnerių seka"
+msgstr "Partnerio seka"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -92,22 +92,22 @@ msgstr ""
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr ""
+msgstr "Kontaktai"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
 msgid "Additional phone field"
-msgstr ""
+msgstr "Papildomos informacijos laukas"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
-msgstr "Funkcija"
+msgstr "Adresas"
 
 #. module: base_contact
 #: field:res.partner.job,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Faksas"
 
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
@@ -117,7 +117,7 @@ msgstr "Kalba"
 #. module: base_contact
 #: field:res.partner.job,phone:0
 msgid "Phone"
-msgstr "Tel. Nr."
+msgstr "Telefonas"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
@@ -127,12 +127,12 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.contact,title:0
 msgid "Title"
-msgstr ""
+msgstr "Antraštė"
 
 #. module: base_contact
 #: view:res.partner.job:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Kontaktų pareigos"
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
@@ -144,7 +144,7 @@ msgstr ""
 msgid ""
 "Order of importance of this job title in the list of job title of the linked "
 "partner"
-msgstr ""
+msgstr "Pareigos pagal svarbumą susijusiam partneriui."
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -155,7 +155,7 @@ msgstr "El. paštas"
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
 msgid "Date Stop"
-msgstr ""
+msgstr "Pabaigos data"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -167,25 +167,25 @@ msgstr "Adresas"
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 #: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
 msgid "Contact's Jobs"
-msgstr ""
+msgstr "Kontaktų pareigos"
 
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Tautybė"
 
 #. 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 ""
+msgstr "Adresai pagal svarbumą sąraše."
 
 #. module: base_contact
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Pagrindinės pareigos"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -195,17 +195,17 @@ msgstr "Kategorijos"
 #. module: base_contact
 #: field:res.partner.contact,function_id:0
 msgid "Main Function"
-msgstr ""
+msgstr "Pagrindinė funkcija"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
 msgid "Define partners and their addresses."
-msgstr ""
+msgstr "Pasirinkite partnerius ir jų adresus"
 
 #. module: base_contact
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Netinkamas XML peržiūros struktūrai!"
 
 #. module: base_contact
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
@@ -215,58 +215,58 @@ msgstr ""
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr ""
+msgstr "Seka"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr ""
+msgstr "Papildomas telefonas"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
 msgid "Mobile"
-msgstr "Mob. tel."
+msgstr "Mobilus telefonas"
 
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr ""
+msgstr "Vidinis/išorinis papildomas telefono numeris"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
 msgid "People you work with."
-msgstr ""
+msgstr "Bendradarbiai"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Papildoma informacija"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: field:res.partner.contact,job_ids:0
 msgid "Functions and Addresses"
-msgstr ""
+msgstr "Pareigos ir adresai"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktyvus"
 
 #. module: base_contact
 #: field:res.partner.job,contact_id:0
 msgid "Contact"
-msgstr "Kontaktai"
+msgstr "Kontaktas"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
 msgid "Companies you work with."
-msgstr ""
+msgstr "Įmonė kurioje jūs dirbate."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr ""
+msgstr "Pagrindinis darbdavys"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
@@ -281,7 +281,7 @@ msgstr "Partnerių kontaktai"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Partner Contact"
-msgstr "Partnerio kontaktas"
+msgstr "Partnerio kontaktai"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
@@ -292,17 +292,17 @@ msgstr "Partneriai"
 #: model:process.node,name:base_contact.process_node_addresses0
 #: view:res.partner:0
 msgid "Addresses"
-msgstr ""
+msgstr "Adresai"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
 msgid "Working and private addresses."
-msgstr ""
+msgstr "Darbo ir asmeninis adresai."
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
 msgid "Last Name"
-msgstr ""
+msgstr "Pavardė"
 
 #. module: base_contact
 #: field:res.partner.job,state:0
@@ -313,22 +313,22 @@ msgstr "Būsena"
 #: view:res.partner.contact:0
 #: view:res.partner.job:0
 msgid "General"
-msgstr "Bendras"
+msgstr "Bendrasis"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Past"
-msgstr ""
+msgstr "Buvęs"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "General Information"
-msgstr "Bendra informacija"
+msgstr "Bendroji informacija"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
 msgid "Jobs at a same partner address."
-msgstr ""
+msgstr "Darbai su to paties partnerio adresu."
 
 #. module: base_contact
 #: field:res.partner.job,name:0
@@ -348,7 +348,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.contact,website:0
 msgid "Website"
-msgstr "Interneto svetainė"
+msgstr "Svetainė"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po
index 426fb570629..5f5320fbf33 100644
--- a/addons/base_contact/i18n/ru.po
+++ b/addons/base_contact/i18n/ru.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2010-07-08 15:37+0000\n"
-"Last-Translator: Pomazan Bogdan <Unknown>\n"
+"PO-Revision-Date: 2010-07-14 08:08+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-07-09 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -67,7 +67,7 @@ msgstr "Имя"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
 msgid "Contact Partner Function"
-msgstr ""
+msgstr "Функции сотрудника партнера"
 
 #. module: base_contact
 #: field:res.partner.job,other:0
@@ -122,7 +122,7 @@ msgstr "Телефон"
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
 msgid "Defines contacts and functions."
-msgstr ""
+msgstr "Определить контакты и функции"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -196,7 +196,7 @@ msgstr "Категории"
 #. module: base_contact
 #: field:res.partner.contact,function_id:0
 msgid "Main Function"
-msgstr ""
+msgstr "Личная функция"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
@@ -211,12 +211,12 @@ msgstr "Неправильный XML для просмотра архитект
 #. module: base_contact
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
 msgid "Base Contact Process"
-msgstr ""
+msgstr "Основной контакт"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr ""
+msgstr "Посл-ть"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
@@ -272,7 +272,7 @@ msgstr "Основной работодатель"
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr ""
+msgstr "Адрес функции"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index e02375d42aa..596fb40c53e 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2010-03-29 00:51+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-07-17 09:25+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-06-22 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -30,7 +30,7 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须是以x_开头并且不能含有特殊字符"
+msgstr "对象名必须以x_开头并且不能包含特殊字符"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
@@ -45,7 +45,7 @@ msgstr "业务伙伴职能"
 #: view:res.partner.address:0
 #: field:res.partner.address,job_ids:0
 msgid "Contacts"
-msgstr "联系人列表"
+msgstr "联系"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
@@ -60,7 +60,7 @@ msgstr "当前"
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
 msgid "First Name"
-msgstr "名"
+msgstr "名字"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
@@ -80,7 +80,7 @@ msgstr "联系人到职能"
 #. module: base_contact
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
@@ -90,7 +90,7 @@ msgstr "业务伙伴到地址"
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr "个联系人"
+msgstr "# 联系人"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
@@ -142,7 +142,7 @@ msgstr "基本联系人管理模块"
 msgid ""
 "Order of importance of this job title in the list of job title of the linked "
 "partner"
-msgstr ""
+msgstr "链接业务伙伴按职称按重要性排序的列表"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -153,19 +153,19 @@ msgstr "电子邮件"
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
 msgid "Date Stop"
-msgstr "停止时间"
+msgstr "停止日期"
 
 #. module: base_contact
 #: view:res.partner:0
 #: field:res.partner.job,address_id:0
 msgid "Address"
-msgstr "地址:"
+msgstr "地址"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 #: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
 msgid "Contact's Jobs"
-msgstr "联系人工作"
+msgstr "联系人职务"
 
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
@@ -177,7 +177,7 @@ msgstr "国籍"
 msgid ""
 "Order of importance of this address in the list of addresses of the linked "
 "contact"
-msgstr ""
+msgstr "链接联系人按地址重要性排序的地址列表"
 
 #. module: base_contact
 #: field:res.partner.address,job_id:0
@@ -203,7 +203,7 @@ msgstr "定义业务伙伴和地址"
 #. module: base_contact
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效的视图结构xml文件!"
 
 #. module: base_contact
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
@@ -218,7 +218,7 @@ msgstr "序号"
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr ""
+msgstr "扩展"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
@@ -311,7 +311,7 @@ msgstr "省/ 州"
 #: view:res.partner.contact:0
 #: view:res.partner.job:0
 msgid "General"
-msgstr "常规"
+msgstr "一般"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -321,7 +321,7 @@ msgstr "过去"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "General Information"
-msgstr "通用信息"
+msgstr "一般信息"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
@@ -336,7 +336,7 @@ msgstr "业务伙伴"
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 568d8a612a2..c82109d9b54 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -26,7 +26,7 @@
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': ['base_iban_data.xml'],
diff --git a/addons/base_iban/i18n/zh_CN.po b/addons/base_iban/i18n/zh_CN.po
index 4c67136d9b1..23f888ddd7d 100644
--- a/addons/base_iban/i18n/zh_CN.po
+++ b/addons/base_iban/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:35+0000\n"
+"PO-Revision-Date: 2010-07-17 09: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-06-22 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
@@ -34,7 +34,7 @@ msgstr "银行帐号"
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr "国家 - ID"
+msgstr "country_id"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
@@ -60,7 +60,7 @@ msgstr "IBAN帐号"
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
-msgstr "账号"
+msgstr "acc_number"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/base_module_doc_rst/__terp__.py b/addons/base_module_doc_rst/__terp__.py
index 4af4b2d3467..8a7fe96b6bd 100644
--- a/addons/base_module_doc_rst/__terp__.py
+++ b/addons/base_module_doc_rst/__terp__.py
@@ -29,7 +29,7 @@
     * It creates a tarball (.tgz file suffix) containing an index file and one file per module
     * Generate Relationship Graph
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py
index e6952263268..53e2d0ebb24 100644
--- a/addons/base_module_quality/__openerp__.py
+++ b/addons/base_module_quality/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Base module quality - To check the quality of other modules' ,
     'version': '1.0',
-    'category': 'Tiny Specific Modules/Base module quality',
+    'category': 'OpenERP SA Specific Modules/Base module quality',
     'description': """
 This module's aim is to check the quality of other modules.
 
@@ -37,7 +37,7 @@ For further info, coders may take a look into base_module_quality\README.txt
 WARNING: This module can not work as a ZIP file, you must unzip it before
 using it, otherwise it may crash.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/base_module_quality/i18n/id.po b/addons/base_module_quality/i18n/id.po
new file mode 100644
index 00000000000..edd55c91ab6
--- /dev/null
+++ b/addons/base_module_quality/i18n/id.po
@@ -0,0 +1,185 @@
+# Indonesian 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: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-07-29 09:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-07-30 03:37+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_module_quality
+#: field:module.quality.check,final_score:0
+msgid "Final Score (%)"
+msgstr ""
+
+#. module: base_module_quality
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: base_module_quality
+#: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
+msgid "Base module quality"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.check,name:0
+msgid "Rated Module"
+msgstr ""
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+msgid "Detail"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,note:0
+msgid "Note"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,detail:0
+msgid "Details"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,ponderation:0
+msgid "Ponderation"
+msgstr ""
+
+#. module: base_module_quality
+#: help:module.quality.detail,ponderation:0
+msgid ""
+"Some tests are more critical than others, so they have a bigger weight in "
+"the computation of final rating"
+msgstr ""
+
+#. module: base_module_quality
+#: view:module.quality.check:0
+#: field:module.quality.check,check_detail_ids:0
+msgid "Tests"
+msgstr ""
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Skipped"
+msgstr ""
+
+#. module: base_module_quality
+#: help:module.quality.detail,state:0
+msgid ""
+"The test will be completed only if the module is installed or if the test "
+"may be processed on uninstalled module."
+msgstr ""
+
+#. module: base_module_quality
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_module_quality_check
+msgid "module.quality.check"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_module_quality
+#: wizard_field:quality_detail_save,init,module_file:0
+msgid "Save report"
+msgstr ""
+
+#. module: base_module_quality
+#: wizard_field:quality_detail_save,init,name:0
+msgid "File name"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,score:0
+msgid "Score (%)"
+msgstr ""
+
+#. module: base_module_quality
+#: help:quality_detail_save,init,name:0
+msgid "Save report as .html format"
+msgstr ""
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+#: field:module.quality.detail,summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_module_quality
+#: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
+msgid "Report Save"
+msgstr ""
+
+#. module: base_module_quality
+#: wizard_view:quality_detail_save,init:0
+msgid "Standard entries"
+msgstr ""
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+msgid "Save Report"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/module_quality_check.py:0
+#: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
+#, python-format
+msgid "Quality Check"
+msgstr ""
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_module_quality_detail
+msgid "module.quality.detail"
+msgstr ""
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: view:module.quality.check:0
+#: view:module.quality.detail:0
+#, python-format
+msgid "Result"
+msgstr ""
+
+#. module: base_module_quality
+#: wizard_button:quality_detail_save,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,message:0
+msgid "Message"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,quality_check_id:0
+msgid "Quality"
+msgstr ""
diff --git a/addons/base_module_quality/i18n/zh_CN.po b/addons/base_module_quality/i18n/zh_CN.po
index 0785b5cd099..7d903c36812 100644
--- a/addons/base_module_quality/i18n/zh_CN.po
+++ b/addons/base_module_quality/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-09 16:41+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-07-17 09:42+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: Simplified Chinese <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-06-22 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -61,14 +61,14 @@ msgstr "详细信息"
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
 msgid "Ponderation"
-msgstr ""
+msgstr "考虑"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
 msgid ""
 "Some tests are more critical than others, so they have a bigger weight in "
 "the computation of final rating"
-msgstr ""
+msgstr "一些测试比其他更重要, 所以它们在计算最终等级时占更大分量."
 
 #. module: base_module_quality
 #: view:module.quality.check:0
@@ -86,12 +86,12 @@ msgstr "已跳过"
 msgid ""
 "The test will be completed only if the module is installed or if the test "
 "may be processed on uninstalled module."
-msgstr "只有模块已经安装或测试能在已卸载的模块上运行的情况下测试才能完成。"
+msgstr "只有模块已安装或如果测试能在已卸载的模块上运行, 测试才能完成."
 
 #. module: base_module_quality
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效的视图结构xml文件!"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_check
@@ -116,7 +116,7 @@ msgstr "文件名"
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
 msgid "Score (%)"
-msgstr ""
+msgstr "评分(%)"
 
 #. module: base_module_quality
 #: help:quality_detail_save,init,name:0
@@ -137,7 +137,7 @@ msgstr "保存报告"
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "普通记录"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index 9e91153be2b..22f413924fb 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -41,7 +41,7 @@ How to use it:
 Run Administration/Customization/Module Creation/Export Customizations As a Module wizard.
 Select datetime critearia of recording and objects to be recorded and Record module.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/base_module_record/i18n/ru.po b/addons/base_module_record/i18n/ru.po
index 06bf1c04a8e..b191fa95feb 100644
--- a/addons/base_module_record/i18n/ru.po
+++ b/addons/base_module_record/i18n/ru.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-16 13:36+0000\n"
+"PO-Revision-Date: 2010-07-14 08:10+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-06-22 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -32,7 +32,7 @@ msgstr "Информация"
 #. module: base_module_record
 #: model:ir.model,name:base_module_record.model_ir_module_record
 msgid "ir.module.record"
-msgstr ""
+msgstr "Системный модуль записи"
 
 #. module: base_module_record
 #: constraint:ir.model:0
diff --git a/addons/base_module_record/i18n/zh_CN.po b/addons/base_module_record/i18n/zh_CN.po
index 420512d5ee6..5afcbbf29f3 100644
--- a/addons/base_module_record/i18n/zh_CN.po
+++ b/addons/base_module_record/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:36+0000\n"
+"PO-Revision-Date: 2010-07-17 09:51+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-06-22 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -66,7 +66,7 @@ msgstr "只记录"
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Demo Data"
-msgstr "示范数据"
+msgstr "演示数据"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
@@ -173,7 +173,7 @@ msgstr "记录信息"
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module successfully created !"
-msgstr "模块创建完成！"
+msgstr "模块已成功创建！"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
@@ -183,7 +183,7 @@ msgstr "停止记录"
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created"
-msgstr "创建"
+msgstr "已创建"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,end:0
@@ -210,7 +210,7 @@ msgstr "修改"
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Recording"
-msgstr "记录"
+msgstr "记录中"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,init,record:0
@@ -275,7 +275,7 @@ msgstr "模块创建"
 msgid ""
 "You can continue the recording session by relauching the 'start recording' "
 "wizard."
-msgstr "你可以继续记录这会话.开始记录向导"
+msgstr "你可以继续记录这会话. '开始记录' 向导"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,data_kind:0
@@ -293,7 +293,7 @@ msgstr "模块信息"
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_save
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_save
 msgid "Save Recorded Module"
-msgstr "保存记录"
+msgstr "保存记录模块"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -314,7 +314,7 @@ msgstr "取消"
 #: wizard_button:base_module_record.module_record_objects,save,end:0
 #: wizard_button:base_module_record.module_save,save,end:0
 msgid "Close"
-msgstr "结束"
+msgstr "关闭"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
diff --git a/addons/base_module_record/wizard/base_module_save.py b/addons/base_module_record/wizard/base_module_save.py
index 7f912c74499..ea3fdb22979 100644
--- a/addons/base_module_record/wizard/base_module_save.py
+++ b/addons/base_module_record/wizard/base_module_save.py
@@ -63,7 +63,7 @@ intro_start_fields = {
     'name': {'string':'Module Name', 'type':'char', 'size':64, 'required':True},
     'directory_name': {'string':'Directory Name', 'type':'char', 'size':32, 'required':True},
     'version': {'string':'Version', 'type':'char', 'size':16, 'required':True},
-    'author': {'string':'Author', 'type':'char', 'size':64, 'default': lambda *args: 'Tiny', 'required':True},
+    'author': {'string':'Author', 'type':'char', 'size':64, 'default': lambda *args: 'OpenERP SA', 'required':True},
     'category': {'string':'Category', 'type':'char', 'size':64, 'default': lambda *args: 'Vertical Modules/Parametrization', 'required':True},
     'website': {'string':'Documentation URL', 'type':'char', 'size':64, 'default': lambda *args: 'http://www.openerp.com', 'required':True},
     'description': {'string':'Full Description', 'type':'text', 'required':True},
diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py
index 8e1ba708850..43ced889725 100644
--- a/addons/base_report_creator/__openerp__.py
+++ b/addons/base_report_creator/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@ for and users.
 After installing the module, it adds a menu to define custom report in
 the "Dashboard" menu.
 """,
-    'author': 'Tiny & Axelor',
+    'author': 'OpenERP SA & Axelor',
     'website': '',
     'depends': ['base', 'board'],
     'init_xml': [],
diff --git a/addons/base_report_creator/i18n/zh_CN.po b/addons/base_report_creator/i18n/zh_CN.po
index 89b36c8fd8e..fe875402b41 100644
--- a/addons/base_report_creator/i18n/zh_CN.po
+++ b/addons/base_report_creator/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"PO-Revision-Date: 2010-07-17 10:17+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-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -22,7 +22,7 @@ msgid ""
 "Provide an expression for the field based on which you want to filter the "
 "records.\n"
 " e.g. res_partner.id=3"
-msgstr "提供一个基于字段的表达式必须过滤记录 .例如res_partner.id=3"
+msgstr "提供一个基于字段过滤记录的表达式. 例如: res_partner.id=3"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
@@ -47,7 +47,7 @@ msgstr "图形模式"
 #. module: base_report_creator
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -182,7 +182,7 @@ msgstr "开始日期"
 #. module: base_report_creator
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
@@ -209,7 +209,7 @@ msgstr "授权组(留空为所有)"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Security"
-msgstr "安全"
+msgstr "安全设定"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report.menu.create,init,menu_name:0
@@ -242,7 +242,7 @@ msgstr "y轴"
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Calendar"
-msgstr "日程表"
+msgstr "日历"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
@@ -274,7 +274,7 @@ msgstr "状态"
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Vertical"
-msgstr "垂直线"
+msgstr "纵向"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,type:0
@@ -299,12 +299,12 @@ msgstr "有效"
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Horizontal"
-msgstr "水平线"
+msgstr "横向"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,group_method:0
 msgid "Grouping Method"
-msgstr "图形模板"
+msgstr "分组方式"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,condition:0
@@ -345,7 +345,7 @@ msgstr "打开报表"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Grouped"
-msgstr "图形"
+msgstr "已分组"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -407,11 +407,9 @@ msgid ""
 "the \"Dashboard\" menu.\n"
 msgstr ""
 "这模块允许你创建任何统计\n"
-"报告几个对象,它是一SQL查询生成器和浏览器\n"
-"和用户\n"
+"报告几个对象, 它是一SQL查询生成器和浏览器\n"
 "\n"
-"安装模块后,它在控制台菜单增加一个自定义的报表菜单在\n"
-"控制台 的 菜单\n"
+"安装模块后, 它在控制台菜单增加一个自定义的报表菜单\n"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
@@ -456,7 +454,7 @@ msgstr "值"
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
 msgid "Bar Chart"
-msgstr "条线图"
+msgstr "柱状图表"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type2:0
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index f19d179a1ed..50fe73f753f 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -25,15 +25,15 @@
     'version': '0.1',
     'category': 'Generic Modules/Base',
     'description': """
-This module is used along with openerp OpenOffice plugin.
+This module is used along with OpenERP OpenOffice plugin.
 You have to first install the plugin which is available at
 http://www.openerp.com
 
-This module adds wizards to import/export .SXW report that
+This module adds wizards to Import/Export .sxw report that
 you can modify in OpenOffice.Once you have modified it you can
 upload the report using the same wizard.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': ['base_report_data.xml'],
diff --git a/addons/base_report_designer/base_report_data.xml b/addons/base_report_designer/base_report_data.xml
index 7e5ec4335ee..bd3854ebdba 100644
--- a/addons/base_report_designer/base_report_data.xml
+++ b/addons/base_report_designer/base_report_data.xml
@@ -7,6 +7,7 @@
 			<field eval="[(6,0,[ref('base.user_root')])]" name="users"/>
 			<field eval="&quot;&quot;&quot;OpenOfficeReportDesigner&quot;&quot;&quot;" name="name"/>
 		</record>
+
        <record id="ir_model_access_openofficereportdesigner0" model="ir.model.access">
            <field name="model_id" ref="base.model_ir_actions_report_xml"/>
            <field eval="1" name="perm_read"/>
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
index 311449fd46c..a4a135c4299 100644
--- a/addons/base_report_designer/base_report_designer.py
+++ b/addons/base_report_designer/base_report_designer.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,11 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import osv
 from wizard.tiny_sxw2rml import sxw2rml
 from StringIO import StringIO
 from report import interface
@@ -27,49 +27,53 @@ import base64
 import pooler
 import tools
 
+
 class report_xml(osv.osv):
     _inherit = 'ir.actions.report.xml'
 
-    def sxwtorml(self,cr, uid, file_sxw,file_type):
+    def sxwtorml(self, cr, uid, file_sxw, file_type):
         '''
         The use of this function is to get rml file from sxw file.
         '''
         sxwval = StringIO(base64.decodestring(file_sxw))
         if file_type=='sxw':
-            fp = tools.file_open('normalized_oo2rml.xsl',
+            fp = tools.file_open('normalized_oo2rml.xsl', 
                     subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
         if file_type=='odt':
-            fp = tools.file_open('normalized_odt2rml.xsl',
+            fp = tools.file_open('normalized_odt2rml.xsl', 
                     subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
-        
+
         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):
         '''
         Untested function
         '''
         pool = pooler.get_pool(cr.dbname)
         sxwval = StringIO(base64.decodestring(file_sxw))
         if file_type=='sxw':
-            fp = tools.file_open('normalized_oo2rml.xsl',
+            fp = tools.file_open('normalized_oo2rml.xsl', 
                     subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
         if file_type=='odt':
-            fp = tools.file_open('normalized_odt2rml.xsl',
+            fp = tools.file_open('normalized_odt2rml.xsl', 
                     subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
         report = pool.get('ir.actions.report.xml').write(cr, uid, [report_id], {
-            'report_sxw_content': base64.decodestring(file_sxw),
-            'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read())),
+            'report_sxw_content': base64.decodestring(file_sxw), 
+            'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read())), 
         })
         db = pooler.get_db_only(cr.dbname)
         interface.register_all(db)
         return True
+
     def report_get(self, cr, uid, report_id, context={}):
         report = self.browse(cr, uid, report_id, context)
         return {
-            'file_type' : report.report_type,
-            'report_sxw_content': report.report_sxw_content and base64.encodestring(report.report_sxw_content) or False,
+            'file_type' : report.report_type, 
+            'report_sxw_content': report.report_sxw_content and base64.encodestring(report.report_sxw_content) or False, 
             'report_rml_content': report.report_rml_content and base64.encodestring(report.report_rml_content) or False
         }
+
 report_xml()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml
index 713dab37d48..c1bb7c35270 100644
--- a/addons/base_report_designer/base_report_designer_wizard.xml
+++ b/addons/base_report_designer/base_report_designer_wizard.xml
@@ -1,31 +1,22 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
 
-		<wizard
-			string="Modify an existing report"
-			model="ir.actions.report.xml"
-			name="base_report_designer.modify"
-			id="wizard_report_designer_modify"/>
+        <wizard string="Modify an existing report"
+            model="ir.actions.report.xml" name="base_report_designer.modify"
+            id="wizard_report_designer_modify" />
 
-		<menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="30"/>
-    	<menuitem
-            id="base.next_id_50"
-            name="Configuration"
-            parent="base.reporting_menu"
-            groups="base.group_system"
-            sequence="3"/>
-		<menuitem
-			parent="base.next_id_50"
-			name="Report Designer"
-			action="wizard_report_designer_modify"
-			type="wizard"
-			id="menu_wizard_report_designer_modify"
-			sequence="70"/>
+        <menuitem icon="terp-graph" id="base.reporting_menu"
+            name="Reporting" sequence="30" />
 
+        <menuitem id="base.next_id_50" name="Configuration"
+            parent="base.reporting_menu" groups="base.group_system" sequence="3" />
 
+        <menuitem parent="base.next_id_50" name="Report Designer"
+            action="wizard_report_designer_modify" type="wizard"
+            id="menu_wizard_report_designer_modify" sequence="70" />
 
-	</data>
+    </data>
 </openerp>
 
 
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index 38acf261b19..59e25bd1d36 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"PO-Revision-Date: 2010-07-17 10:22+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-06-22 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,text:0
 msgid "Introduction"
-msgstr "介绍"
+msgstr "简介"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form:0
@@ -98,7 +98,7 @@ msgid ""
 "open it with OpenOffice. Don't forget to install the Tiny OpenOffice package "
 "to modify it. Once it is modified, re-upload it in Open ERP using this "
 "wizard."
-msgstr "这是你要求报表的模板.保存为一个.SXW文件和用openoffice打开和修改.修改后使用这个向导重新上传"
+msgstr "这是你要求报表的模板. 保存为一个.SXW文件和用openoffice打开和修改. 修改后使用这个向导重新上传"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,send_form,send_form_result:0
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 273608c03d9..98d0bf07ed9 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -39,7 +39,7 @@ intro_fields = {
         'string': 'Introduction',
         'type': 'text',
         'readonly': True,
-        'default': lambda *args: """This system must be used with the Tiny OpenOffice plugin. If you
+        'default': lambda *args: """This system must be used with the OpenERP SA OpenOffice plugin. If you
 did not installed yet, you can find this package on:
     http://www.openerp.com
 
@@ -83,7 +83,7 @@ get_form_result = '''<?xml version="1.0"?>
     <newline/>
     <field name="file_sxw"/>
     <newline/>
-    <label colspan="4" string="This is the template of your requested report.\nSave it as a .SXW file and open it with OpenOffice.\nDon't forget to install the Tiny OpenOffice package to modify it.\nOnce it is modified, re-upload it in Open ERP using this wizard." align="0.0"/>
+    <label colspan="4" string="This is the template of your requested report.\nSave it as a .SXW file and open it with OpenOffice.\nDon't forget to install the OpenERP SA OpenOffice package to modify it.\nOnce it is modified, re-upload it in Open ERP using this wizard." align="0.0"/>
 </form>'''
 
 get_form_fields = {
@@ -144,7 +144,7 @@ rml_form_fields = {
        'file_rml': {
         'string': 'Save As',
         'type': 'binary',
-    } 
+    }
 }
 
 save_rml_arch = '''<?xml version="1.0"?>
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index ee0cc6a8f56..fbee18b9476 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -37,13 +37,15 @@
     It also asks screens to help easily configure your company, the header and
     footer, the account chart to install and the language.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': ['base_setup_data.xml'],
     'update_xml': ['security/ir.model.access.csv',
                    'base_setup_installer.xml',
-                   'base_setup_todo.xml','gtk_contact_form.xml'],
+                   'base_setup_todo.xml',
+#                   'gtk_contact_form.xml'
+                   ],
     'demo_xml': ['base_setup_demo.xml'],
     'installable': True,
     'active': True,
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index eb214ac5614..f8f38bc644f 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -7,25 +7,25 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
       <form string="Setup">
-	      <group colspan="4" col="8">
-              	<group colspan="3" width="200">
-                	<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                	<newline/>
-                	<label align="0.0" string="You can start configuring the system or connect directly to the database as an administrator." width="200" colspan="2"/>
-              	</group>
-              	<separator string="" orientation="vertical" colspan="1" rowspan="8"/>
-            	<group colspan="4" width="400">
-              		<separator string="Installation Done" colspan="4"/>
-              		<label align="0.0" string="Your database is now created." colspan="4"/>
-       				<field name="installed_users" nolabel= "1" colspan="4"/>
-            	</group>
-			</group>
-            	<group colspan="8" col="8">
-            		<separator string="" colspan="8"/>
-    				<label string="" colspan="6"/>
-					<button name="menu" icon="gtk-ok" type="object" string="Use Directly" colspan="1"/>
-					<button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
-           </group>
+        <group colspan="4" col="8">
+          <group colspan="3" width="220">
+            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+            <newline/>
+            <label align="0.0" string="You can start configuring the system or connect directly to the database as an administrator." width="200" colspan="2"/>
+          </group>
+          <separator string="" orientation="vertical" colspan="1" rowspan="8"/>
+          <group colspan="4" width="400">
+            <separator string="Installation Done" colspan="4"/>
+            <label align="0.0" string="Your database is now created." colspan="4"/>
+            <field name="installed_users" nolabel= "1" colspan="4"/>
+          </group>
+        </group>
+        <group colspan="8" col="8">
+          <separator string="" colspan="8"/>
+          <label string="" colspan="6"/>
+          <button name="menu" icon="gtk-ok" type="object" string="Use Directly" colspan="1"/>
+          <button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
+        </group>
     </form>
    </field>
   </record>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 009af3ffd55..48710b840ea 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -23,18 +23,18 @@
             <attribute name="string">Install Generic Modules</attribute>
           </separator>
           <group colspan="8">
-            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
-            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
-            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
-            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
-            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
-            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
+            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/>
+            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/>
+            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/>
+            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/>
+            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/>
+            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/>
+            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/>
             <separator string="Install Specific Business Modules" colspan="4"/>
-            <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
-            <field name="profile_auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
-            <field name="profile_bookstore" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
-            <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
+            <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/>
+            <field name="profile_auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/>
+            <field name="profile_bookstore" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/>
+            <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,profile_auction,profile_bookstore)"/>
           </group>
         </data>
       </field>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index cfe815fb94e..ceb915e1212 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -11,7 +11,7 @@
             <attribute name="string">Main Company Setup</attribute>
           </form>
           <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Information of your company will be used to custiomise your documents like Invoices, Sale Orders and many more.</attribute>
+                <attribute name="string">Information of your company will be used to customize your documents like Invoices, Sale Orders and many more.</attribute>
           </xpath>
           <xpath expr='//separator[@string="title"]' position='attributes'>
                     <attribute name='string'>Configure Your Company</attribute>
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 26a834bf11f..d75f76c57c3 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"PO-Revision-Date: 2010-07-17 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-06-22 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -84,12 +84,12 @@ msgstr "电子邮件"
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr "省市"
+msgstr "省/州"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Your new database is now fully installed."
-msgstr "新账套已安装完毕."
+msgstr "新帐套已安装完毕."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,profile:0
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 5f6318ec5a1..04a20a6f32b 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -154,7 +154,7 @@ base_setup_company()
 
 class res_currency(osv.osv):
     _inherit = 'res.currency'
-    
+
     def name_get(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -168,7 +168,7 @@ class res_currency(osv.osv):
             ids = [ids]
         reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write')
         return [(x['id'], tools.ustr(x['name']) + ' (' + tools.ustr(x['code']) + ')')   for x in reads]
-        
+
 res_currency()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index ff34cd3e09c..ab148f97494 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -28,7 +28,7 @@
     This module follows the methods stated at http://sima-pc.com/nif.php for
     checking the validity of VAT Number assinged to partners in European countries.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['account'],
     'website': 'http://www.openerp.com',
     'update_xml': ['base_vat_view.xml'],
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index bafb4be1602..72f054e0161 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Board/Base',
     'description': """Base module for all dashboards.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base'],
     'update_xml': ['security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml'],
     'demo_xml': [],
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index f34c0ce5917..62204969468 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -3,7 +3,7 @@
     <data>
         <menuitem icon="terp-graph" id="base.reporting_menu"
             name="Reporting" sequence="30" />
-        <menuitem icon="terp-graph" id="menu_dasboard"
+        <menuitem id="menu_dasboard"
             name="Dashboard" sequence="30" />     
 <!--Board Note Search View  -->
         <record id="view_board_note_search" model="ir.ui.view">
diff --git a/addons/board/i18n/lt.po b/addons/board/i18n/lt.po
index f4dd71acec9..8e64016a2c0 100644
--- a/addons/board/i18n/lt.po
+++ b/addons/board/i18n/lt.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2009-11-18 06:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-07-20 22:26+0000\n"
+"Last-Translator: Paulius Sladkevičius <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-06-22 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -21,32 +21,34 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Objekto pavadinimas turi prasidėti x_ ir negali turėti jokių specialiųjų "
+"ženklų !"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "board.board"
-msgstr ""
+msgstr "Veiklos monitoringas"
 
 #. module: board
 #: field:board.note,user_id:0
 msgid "Author"
-msgstr ""
+msgstr "Autorius"
 
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr ""
+msgstr "Veiklos monitoringo modulis"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note,note:0
 msgid "Note"
-msgstr ""
+msgstr "Pastaba"
 
 #. module: board
 #: field:board.board.line,width:0
 msgid "Width"
-msgstr ""
+msgstr "Plotis"
 
 #. module: board
 #: constraint:ir.actions.act_window:0
@@ -56,39 +58,39 @@ msgstr ""
 #. module: board
 #: field:board.board.line,name:0
 msgid "Title"
-msgstr ""
+msgstr "Antraštė"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
 #: model:ir.ui.menu,name:board.menu_view_board_form
 msgid "Dashboard Definition"
-msgstr ""
+msgstr "Veiklos monitoringo nustatymai"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
 #: model:ir.ui.menu,name:board.menu_view_board_note_form
 msgid "Publish a note"
-msgstr ""
+msgstr "Publikuoti pastabą"
 
 #. module: board
 #: wizard_view:board.board.menu.create,init:0
 msgid "Menu Information"
-msgstr ""
+msgstr "Meniu informacija"
 
 #. module: board
 #: field:board.board,line_ids:0
 msgid "Action Views"
-msgstr ""
+msgstr "Vaizdas"
 
 #. module: board
 #: model:ir.model,name:board.model_board_note
 msgid "board.note"
-msgstr ""
+msgstr "Pastaba"
 
 #. module: board
 #: field:board.note,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: board
 #: model:ir.ui.menu,name:board.next_id_50
@@ -98,122 +100,125 @@ msgstr "Nustatymai"
 #. module: board
 #: field:board.note.type,name:0
 msgid "Note Type"
-msgstr ""
+msgstr "Pastabos tipas"
 
 #. module: board
 #: wizard_view:board.board.menu.create,init:0
 msgid "Create Menu For Dashboard"
-msgstr ""
+msgstr "Sukurti meniu veiklos monitoringui"
 
 #. module: board
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Netinkamas XML peržiūros strūkturai!"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Bazinis meniu"
 
 #. module: board
 #: view:board.note:0
 msgid "Notes"
-msgstr ""
+msgstr "Pastabos"
 
 #. module: board
 #: model:ir.model,name:board.model_board_note_type
 msgid "board.note.type"
-msgstr ""
+msgstr "Monitoringo pastabų tipas"
 
 #. module: board
 #: view:board.board:0
 #: field:board.board,name:0
 #: field:board.board.line,board_id:0
 msgid "Dashboard"
-msgstr ""
+msgstr "Veiklos monitoringas"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
 msgid "Base module for all dashboards."
-msgstr ""
+msgstr "Veiklos monitoringo pagrindinis modulis"
 
 #. module: board
 #: field:board.board.line,position:0
 msgid "Position"
-msgstr ""
+msgstr "Pareigos"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
 msgid "Open Dashboard"
-msgstr ""
+msgstr "Atidaryti veiklos monitoringą"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Meniu pavadinimas"
 
 #. module: board
 #: field:board.note,type:0
 msgid "Note type"
-msgstr ""
+msgstr "Pastabos tipas"
 
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Left"
-msgstr ""
+msgstr "Kairėje"
 
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr ""
+msgstr "Veiklos monitoringas"
 
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Right"
-msgstr ""
+msgstr "Dešinėje"
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seka"
 
 #. module: board
 #: view:board.board:0
 #: wizard_button:board.board.menu.create,init,create_menu:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Sukurti meniu"
 
 #. module: board
 #: model:ir.ui.menu,name:board.dashboard_menu
 msgid "Dashboards"
-msgstr ""
+msgstr "Veiklos monitoringas"
 
 #. module: board
 #: field:board.board.line,height:0
 msgid "Height"
-msgstr ""
+msgstr "Aukštis"
 
 #. module: board
 #: model:ir.actions.wizard,name:board.wizard_board_create_menu
 msgid "Create Board Menu"
-msgstr ""
+msgstr "Sukurti veiklos monitoringo meniu"
 
 #. module: board
 #: wizard_button:board.board.menu.create,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr ""
+msgstr "Veiklos monitoringo vaizdas"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "board.board.line"
-msgstr ""
+msgstr "Monitoringo eilutė"
 
 #. module: board
 #: field:board.note,name:0
 msgid "Subject"
-msgstr ""
+msgstr "Tema"
+
+#~ msgid "Action"
+#~ msgstr "Veiksmas"
diff --git a/addons/board/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po
index a31d0df0901..fddab65c08d 100644
--- a/addons/board/i18n/zh_CN.po
+++ b/addons/board/i18n/zh_CN.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"PO-Revision-Date: 2010-07-17 14:45+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-06-22 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
@@ -30,12 +30,12 @@ msgstr "控制台"
 #. module: board
 #: field:board.note,user_id:0
 msgid "Author"
-msgstr "建立者"
+msgstr "作者"
 
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr "控制台主要模块"
+msgstr "控制面板主要模块"
 
 #. module: board
 #: view:board.note:0
@@ -51,7 +51,7 @@ msgstr "宽度"
 #. module: board
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义中使用了无效的模快名。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -62,7 +62,7 @@ msgstr "标题"
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
 #: model:ir.ui.menu,name:board.menu_view_board_form
 msgid "Dashboard Definition"
-msgstr "控制台定义"
+msgstr "控制面板定义"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
@@ -103,12 +103,12 @@ msgstr "备注类型"
 #. module: board
 #: wizard_view:board.board.menu.create,init:0
 msgid "Create Menu For Dashboard"
-msgstr "创建控制台菜单"
+msgstr "创建控制面板菜单"
 
 #. module: board
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_parent_id:0
@@ -130,12 +130,12 @@ msgstr "备注类型"
 #: field:board.board,name:0
 #: field:board.board.line,board_id:0
 msgid "Dashboard"
-msgstr "控制台"
+msgstr "控制面板"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
 msgid "Base module for all dashboards."
-msgstr "所有控制台的基础模块"
+msgstr "所有控制面板的基础模块"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -145,7 +145,7 @@ msgstr "位置"
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
 msgid "Open Dashboard"
-msgstr "打开控制台"
+msgstr "打开控制面板"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_name:0
@@ -186,7 +186,7 @@ msgstr "创建菜单"
 #. module: board
 #: model:ir.ui.menu,name:board.dashboard_menu
 msgid "Dashboards"
-msgstr "控制台"
+msgstr "控制面板"
 
 #. module: board
 #: field:board.board.line,height:0
@@ -206,7 +206,7 @@ msgstr "取消"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr "控制台视图"
+msgstr "控制面板视图"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
@@ -218,5 +218,13 @@ msgstr "控制台明细"
 msgid "Subject"
 msgstr "主题"
 
+#, python-format
+#~ msgid "User Error!"
+#~ msgstr "用户错误！"
+
+#, python-format
+#~ msgid "Please Insert Dashboard View(s) !"
+#~ msgstr "请插入看板视图！"
+
 #~ msgid "Action"
 #~ msgstr "动作"
diff --git a/addons/board_account/i18n/pt_BR.po b/addons/board_account/i18n/pt_BR.po
new file mode 100644
index 00000000000..2ff98fb547f
--- /dev/null
+++ b/addons/board_account/i18n/pt_BR.po
@@ -0,0 +1,95 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* board_account
+#
+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"
+"PO-Revision-Date: 2010-07-28 14:34+0000\n"
+"Last-Translator: Leandro Chaves <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-07-29 03:33+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Contas analíticas a fechar"
+
+#. module: board_account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: board_account
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Invalido XML para Arquitetura da View"
+
+#. module: board_account
+#: model:ir.actions.act_window,name:board_account.open_board_account
+#: model:ir.ui.menu,name:board_account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Painel contábil"
+
+#. module: board_account
+#: model:ir.actions.act_window,name:board_account.action_aged_receivable
+msgid "Receivable Accounts"
+msgstr "Contas a receber"
+
+#. module: board_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_account.act_my_account
+msgid "Accounts to invoice"
+msgstr "contas a faturar"
+
+#. module: board_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Custos a faturar"
+
+#. module: board_account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Recebíveis vencidos"
+
+#. module: board_account
+#: model:ir.module.module,shortdesc:board_account.module_meta_information
+msgid "Board for accountant"
+msgstr "Painel para contadores"
+
+#. module: board_account
+#: model:ir.actions.act_window,name:board_account.action_aged_income
+msgid "Income Accounts"
+msgstr "Contas de Receita"
+
+#. module: board_account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Meus indicadores"
+
+#. module: board_account
+#: 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: board_account
+#: model:ir.ui.menu,name:board_account.next_id_68
+msgid "Accounting"
+msgstr "Contabilidade"
+
+#. module: board_account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Painel Contábil"
+
+#. module: board_account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Receita vencida"
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index 3717ad32d83..cdb06a17a1f 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -43,7 +43,7 @@
         DATABASE_NAME: Name of database on which OpenERP Calendar is created
         CALENDAR_NAME: Name of calendar to access
 """, 
-    "author" : "Tiny", 
+    "author" : "OpenERP SA", 
     'category': 'Generic Modules/Others', 
     'website': 'http://www.openerp.com', 
     "init_xml" : ["caldav_data.xml"], 
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index c530a5605fb..c2572e1604e 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -1,5 +1,5 @@
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -14,13 +14,13 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 {
     "name" : "Claim from delivery",
     "version" : "1.0",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Generic Modules/Inventory Control",
     "depends" : ["base", "crm_claim", "stock"],
     "init_xml" : [],
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index f23b61df5ea..16306abfb44 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -50,7 +50,7 @@ Create dashboard for CRM that includes:
     * My Cases (list)
     * Jobs Tracking (graph)
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': [
         'base',
@@ -83,9 +83,10 @@ Create dashboard for CRM that includes:
         'wizard/crm_opportunity_to_phonecall_view.xml',
         'wizard/crm_partner_to_opportunity_view.xml',
 
-        'wizard/crm_forward_to_partner_view.xml',
         'wizard/crm_send_email_view.xml',
+        'wizard/crm_forward_to_partner_view.xml',
         'wizard/crm_custom_create_menu_view.xml',
+        'wizard/crm_merge_opportunities_view.xml',
 
         'crm_view.xml',
 
@@ -123,7 +124,7 @@ Create dashboard for CRM that includes:
     ],
     'test': [
             'test/test_crm_lead.yml',
-            #'test/test_crm_meeting.yml',
+            'test/test_crm_meeting.yml',
             'test/test_crm_opportunity.yml',
             'test/test_crm_phonecall.yml',
              ],
diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
index 01d0472c21e..01aa479479f 100644
--- a/addons/crm/board_crm_statistical_view.xml
+++ b/addons/crm/board_crm_statistical_view.xml
@@ -112,7 +112,7 @@
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
 
-	    <menuitem icon="terp-graph" id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
+	    <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
 
         <menuitem
             name="Statistics Dashboard" parent="board.menu_dasboard"
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index aec83760a76..9a5217a623a 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -152,7 +152,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_crm_form"/>
         </record>
-	    <menuitem icon="terp-graph" id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
+	    <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
         <menuitem
             name="Connecting Dashboard" parent="board.menu_dasboard"
             action="open_board_crm"
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 743650d5497..47a3938e1e2 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -121,7 +121,6 @@ class crm_case(object):
         s = self.get_stage_dict(cr, uid, ids, context=context)
         section = self._name
         stage = False
-        stage_pool = self.pool.get('crm.case.stage')
         for case in self.browse(cr, uid, ids, context):
             if section in s:
                 st =  not context.get('force_domain', False) and case.stage_id.id  or False
@@ -141,8 +140,18 @@ class crm_case(object):
         if not context:
             context = {}
         stage_obj = self.pool.get('crm.case.stage')
-        tmp = self.read(cr, uid, ids, ['section_id'], context)[0]['section_id']
-        section_id = tmp and tmp[0] or False
+        res = self.read(cr, uid, ids, ['section_id', 'stage_id'], context)[0]
+        section_id = res['section_id'] and res['section_id'][0] or False
+        stage_id = res['stage_id'] and res['stage_id'][0] or False
+
+        # We select either the stages in the same section as the current stage
+        # if it a stage that does not have a section, or the stages of the 
+        # current section of the case
+        if stage_id:
+            stage_record = stage_obj.browse(cr, uid, stage_id)
+            if not stage_record.section_id:
+                section_id = False # only select stages without section
+
         domain = [('object_id.model', '=', self._name), ('section_id', '=', section_id)]
         if 'force_domain' in context and context['force_domain']:
             domain += context['force_domain']
@@ -150,6 +159,7 @@ class crm_case(object):
         s = {}
         previous = {}
         section = self._name
+
         for stage in stage_obj.browse(cr, uid, sid, context=context):
             s.setdefault(section, {})
             s[section][previous.get(section, False)] = stage.id
@@ -301,6 +311,13 @@ class crm_case(object):
         self.write(cr, uid, ids, {'state': 'cancel',
                                   'active': True})
         self._action(cr, uid, cases, 'cancel')
+        for case in cases:
+            message = "The " + self._description + " '" + case.name + "' has been Cancelled."
+            #TODO: Need to differentiate lead and opportunity
+#            if hasattr(case, 'type'):
+#                #TO CHECK: hasattr gives warning for other crm objects that don't have field 'type'
+#                message = "The " + (case.type or 'Case').title() + " '" + case.name + "' has been Cancelled."
+            self.log(cr, uid, case.id, message)
         return True
 
     def case_pending(self, cr, uid, ids, *args):
@@ -369,7 +386,10 @@ class crm_case(object):
                 if not destination:
                     src, dest = dest, src
                     if body and case.user_id.signature:
-                        body += '\n\n%s' % (case.user_id.signature)
+                        if body:
+                            body += '\n\n%s' % (case.user_id.signature)
+                        else:
+                            body = '\n\n%s' % (case.user_id.signature)
 
                 body = self.format_body(body)
 
@@ -422,7 +442,7 @@ class crm_case(object):
         rule_obj = self.pool.get('base.action.rule')
         model_obj = self.pool.get('ir.model')
         model_ids = model_obj.search(cr, uid, [('model','=',self._name)])
-        rule_ids = rule_obj.search(cr, uid, [('name','=',model_ids[0])])
+        rule_ids = rule_obj.search(cr, uid, [('model_id','=',model_ids[0])])
         return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context)
 
     def format_body(self, body):
@@ -441,14 +461,13 @@ class crm_case_section(osv.osv):
     _columns = {
         'name': fields.char('Sales Team', size=64, required=True, translate=True),
         'code': fields.char('Code', size=8),
-        'active': fields.boolean('Active', help="If the active field is set to \
-                        true, it will allow you to hide the sales team without removing it."),
+        'active': fields.boolean('Active', help="If the active field is set to "\
+                        "true, it will allow you to hide the sales team without removing it."),
         'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
         'change_responsible': fields.boolean('Change Responsible', help="Thick this box if you want that on escalation, the responsible of this sale team automatically becomes responsible of the lead/opportunity escaladed"),
         'user_id': fields.many2one('res.users', 'Responsible User'),
         'member_ids':fields.many2many('res.users', 'sale_member_rel', 'section_id', 'member_id', 'Team Members'),
-        'reply_to': fields.char('Reply-To', size=64, help="The email address put \
-                        in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"),
+        'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
         'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
@@ -586,8 +605,7 @@ class crm_case_stage(osv.osv):
     _columns = {
         'name': fields.char('Stage Name', size=64, required=True, translate=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order \
-                        when displaying a list of case stages."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
         'object_id': fields.many2one('ir.model', 'Object Name'),
         'probability': fields.float('Probability (%)', required=True),
         'on_change': fields.boolean('Change Probability Automatically', \
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 8fb7c02ff85..5f2a4ce63ee 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -30,19 +30,19 @@ import tools
 class crm_installer(osv.osv_memory):
     _name = 'crm.installer'
     _inherit = 'res.config.installer'
-    
+
     _columns = {
-        'name': fields.char('Name', size=64), 
-        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), 
-        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fund raising process and tracking."), 
-        'crm_claim': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), 
-        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."), 
-        'sale_crm': fields.boolean('Create Quotation from Opportunity', help="This module relates sale to opportunity cases in the CRM."),
+        'name': fields.char('Name', size=64),
+        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
+        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fund raising process and tracking."),
+        'crm_claim': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."),
+        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."),
+        'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale to opportunity cases in the CRM."),
         'fetchmail': fields.boolean('Fetch Emails', help="Fetchmail Server."),
-        'thunderbird': fields.boolean('Thunderbird', help="Thunderbird Interface."), 
-        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Sale FAQ."), 
+        'thunderbird': fields.boolean('Thunderbird', help="Thunderbird Interface."),
+        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Sale FAQ."),
     }
-    
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(crm_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         #Checking sale module is installed or not
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 6d8f4b7120f..322f9425122 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">CRM Modules Installation</attribute>
+            <attribute name="string">CRM Modules Configuration</attribute>
           </form>
 
           <separator string="title" position="attributes">
@@ -41,7 +41,7 @@
           	<group colspan="2" col="2">
 			<separator string="Plugins" colspan="4" />
           		<field name="thunderbird" />
-          		<label string="*Outlook*" />
+<!--          		<label string="*Outlook*" />-->
 <!--    TODO      		<field name="outlook" />-->
           	</group>
           </group>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9069bec1d17..6606dfdef4a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,15 +19,13 @@
 #
 ##############################################################################
 
-from osv import fields, osv, orm
-from datetime import datetime, timedelta
+from osv import fields, osv
+from datetime import datetime
 import crm
-import math
 import time
 import mx.DateTime
 from tools.translate import _
 from crm import crm_case
-import collections
 import binascii
 import tools
 
@@ -113,12 +111,9 @@ class crm_lead(osv.osv, crm_case):
         'date_action_next': fields.datetime('Next Action', readonly=1),
         'email_from': fields.char('Email', size=128, help="E-mail address of the contact"),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
-                        select=True, help='Sales team to which this case belongs to.\
-                             Defines responsible user and e-mail address for the mail gateway.'),
+                        select=True, help='Sales team to which this case belongs to. Defines responsible user and e-mail address for the mail gateway.'),
         'create_date': fields.datetime('Creation Date' , readonly=True),
-        'email_cc': fields.text('Watchers Emails', size=252 , help="These \
-addresses will receive a copy of the future e-mail communication between partner \
-and users"),
+        'email_cc': fields.text('Watchers Emails', size=252 , help="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"),
         'description': fields.text('Notes'),
         'write_date': fields.datetime('Update Date' , readonly=True),
 
@@ -139,9 +134,7 @@ and users"),
         ],'Type', help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', \
-                            domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.lead')]"),
+        'stage_id': fields.many2one('crm.case.stage', 'Stage'),
         'user_id': fields.many2one('res.users', 'Salesman',help='By Default Salesman is Administrator when create New User'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
@@ -154,8 +147,9 @@ and users"),
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
-        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)], readonly=True),
+        '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"),
     }
 
     _defaults = {
@@ -168,7 +162,21 @@ and users"),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
-    
+
+    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
+        """This function returns value of partner email based on Partner Address
+        @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 case IDs
+        @param add: Id of Partner's address
+        @email: Partner's email ID
+        """
+        if not add:
+            return {'value': {'email_from': False, 'country_id': False}}
+        address = self.pool.get('res.partner.address').browse(cr, uid, add)
+        return {'value': {'email_from': address.email, 'phone': address.phone, 'country_id': address.country_id.id}}
+
     def case_open(self, cr, uid, ids, *args):
         """Overrides cancel for crm_case for setting Open Date
         @param self: The object pointer
@@ -181,14 +189,16 @@ and users"),
         res = super(crm_lead, self).case_open(cr, uid, ids, *args)
         if old_state == 'draft':
             stage_id = super(crm_lead, self).stage_next(cr, uid, ids, *args)
-            if not stage_id:
-                raise osv.except_osv(_('Warning !'), _('There is no stage defined for this Sale Team.'))
-            value = self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value']
+            if stage_id:
+                value = self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value']
+            else:
+                value = {}
             value.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'stage_id': stage_id})
             self.write(cr, uid, ids, value)
 
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The Lead') + " '" + name + "' "+ _("has been written as Open.")
+            type = self.browse(cr, uid, id).type or 'Lead'
+            message = (_('The ') + type.title()) + " '" + name + "' "+ _("has been Opened.")
             self.log(cr, uid, id, message)
         return res
 
@@ -203,8 +213,10 @@ and users"),
         res = super(crm_lead, self).case_close(cr, uid, ids, args)
         self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The Lead') + " '" + name + "' "+ _("has been written as Closed.")
-            self.log(cr, uid, id, message)
+            lead = self.browse(cr, uid, id)
+            if lead.type == 'lead':
+                message = _('The Lead') + " '" + name + "' "+ _("has been Closed.")
+                self.log(cr, uid, id, message)
         return res
 
     def convert_opportunity(self, cr, uid, ids, context=None):
@@ -220,12 +232,13 @@ and users"),
         context.update({'active_ids': ids})
 
         data_obj = self.pool.get('ir.model.data')
-        data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_create')
+        data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action')
         value = {}
 
         view_id = False
         if data_id:
             view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+
         for case in self.browse(cr, uid, ids):
             context.update({'active_id': case.id})
             if not case.partner_id:
@@ -251,7 +264,7 @@ and users"),
                         'name': _('Create Opportunity'),
                         'view_type': 'form',
                         'view_mode': 'form,tree',
-                        'res_model': 'crm.lead2opportunity',
+                        'res_model': 'crm.lead2opportunity.action',
                         'view_id': False,
                         'context': context,
                         'views': [(view_id, 'form')],
@@ -330,7 +343,6 @@ and users"),
         if isinstance(ids, (str, int, long)):
             ids = [ids]
 
-        msg_from = msg['from']
         if msg.get('priority'):
             vals['priority'] = msg.get('priority')
 
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 7101473589b..9b7b1da2031 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -131,6 +131,7 @@
             <field eval="&quot;Smith John&quot;" name="partner_name2"/>
             <field eval="&quot;(487) 013-1504&quot;" name="partner_mobile"/>
             <field name="categ_id" ref="crm.categ_oppor6"/>
+            <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="&quot;Website Visitor&quot;" name="partner_name"/>
             <field eval="&quot;smith_john@gmail.com&quot;" name="email_from"/>
             <field eval="time.strftime('%Y-%m-16 10:05:15')" name="date"/>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 6edce727647..0bb854fea17 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -11,6 +11,7 @@
         <field name="context">{"search_default_user_id":uid,'search_default_current':1}</field>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
         <field name="context">{'search_default_current':1, 'default_type': 'lead'}</field>
+        <field name="help">A lead is a first, unqualified, contact with a new prospect. Use leads when you import a database of prospects or integrate your website's contact form with OpenERP. After having been qualified, the lead can be converted to a partner and a business opportunity for a further detailed tracking of the related activities.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7a614a16211..709178a2cc3 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -15,7 +15,7 @@
 
      <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
         groups="base.group_extended" sequence="0"
-        parent="menu_crm_config_lead" />
+        parent="base.menu_crm_config_lead" />
 
 
         <!--  Resource Type Form View -->
@@ -31,7 +31,7 @@
       <menuitem action="crm_lead_resource_act"
             id="menu_crm_lead_resource_act" name="Lead Sources"
             groups="base.group_extended" sequence="2"
-            parent="menu_crm_config_lead" />
+            parent="base.menu_crm_config_lead" />
 
         <!-- CRM Lead Form View  -->
         <record model="ir.ui.view" id="crm_case_form_view_leads">
@@ -53,8 +53,8 @@
                     <newline />
                     <field name="section_id" widget="selection" />
                     <field name="user_id" />
-                    <field name="stage_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.lead')]" />
+                    <field name="stage_id"
+                        domain="[('section_id','=',section_id), ('object_id.model', '=', 'crm.lead')]" />
                     <group col="2" colspan="1">
                         <button name="stage_previous" string="Previous"
                             states="open,pending" type="object"
@@ -91,7 +91,7 @@
                         <field name="mobile"/>
                         <newline/>
                         <separator string="Links" colspan="4" col="3"/>
-                        <field name="partner_id"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
                         <button
                             name="%(action_crm_lead2partner)d"
                             icon="gtk-index" type="action"
@@ -154,12 +154,19 @@
                         <field name="day_close"/>
                     </group>
                  </page>
-                 <page string="Emails" groups="base.group_extended">
+                 <page string="History" groups="base.group_extended">
                    <group colspan="4">
-                       <field colspan="4" name="email_cc" string="CC" widget="char" size="512"/>
+                       <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
                    </group>
-                    <!-- TODO-->
-                    <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
+                    <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                        <tree string="Communication history">
+                            <field name="display_text" string="History Information"/>
+                            <button
+                                string="Reply"
+                                name="%(crm.action_crm_send_mail)d"
+                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
+                                icon="terp-mail-replied" type="action" />
+                        </tree>
                         <form string="Communication history">
                             <group col="4" colspan="4">
                                 <field name="email_from"/>
@@ -177,27 +184,20 @@
                                 </page>
                             </notebook>
                             <button colspan="4"
-                            string="Reply"
-                            name="%(crm.action_crm_send_mail)d"
-                            context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                            icon="gtk-undo" type="action" />
+                                string="Reply"
+                                name="%(crm.action_crm_send_mail)d"
+                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
+                                icon="terp-mail-replied" type="action" />
                         </form>
-                        <tree string="Communication history">
-                            <field name="date"/>
-                            <field name="email_from" />
-                            <field name="email_to"/>
-                            <field name="description"/>
-                        </tree>
                     </field>
                     <button colspan="2" string="Send New Email"
                         name="%(crm.action_crm_send_mail)d"
                         context="{'mail':'new', 'model': 'crm.lead'}"
-                        icon="gtk-go-forward" type="action" />
-                    <button colspan="2" string="Forward to Partner"
+                        icon="terp-mail-message-new" type="action" />
+                    <button colspan="2" string="Forward"
                         name="%(crm_lead_forward_to_partner_act)d"
-                        icon="gtk-go-forward" type="action" />
+                        icon="terp-mail-forward" type="action" />
                  </page>
-
                 </notebook>
             </form>
         </field>
@@ -223,7 +223,7 @@
                 <field name="type_id" invisible="1"/>
                 <field name="referred" invisible="1"/>
 
-                <field name="stage_id"/>
+                <field name="stage_id" />
                 <button name="stage_previous" string="Previous Stage"
                     states="open,pending" type="object" icon="gtk-go-back" />
                 <button name="stage_next" string="Next Stage"
@@ -310,27 +310,13 @@
                     <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        help="My Sales Team"/>
+                        help="My Sales Team(s)"/>
                     <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[]"
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
-                <group  expand="0" string="Extended options..." groups="base.group_extended">
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                      <separator orientation="vertical"/>
-                      <field name="country_id" context="{'invisible_country': False}">
-                          <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
-                      </field>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                      <newline/>
-                      <field name="create_date" string="Creation Date"/>
-                      <field name="date_closed"/>
-                </group>
-                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -343,6 +329,20 @@
                     <filter string="Creation" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" />
                 </group>
+                <newline/>
+                <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <separator orientation="vertical"/>
+                      <field name="country_id" context="{'invisible_country': False}">
+                          <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                      </field>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                      <newline/>
+                      <field name="create_date" string="Creation Date"/>
+                      <field name="date_closed"/>
+                </group>
            </search>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 1bc5948fe73..798f746f9e3 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -51,8 +51,7 @@ class crm_meeting(osv.osv, crm_case):
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]", states={'done': [('readonly', True)]}), 
         'section_id': fields.many2one('crm.case.section', 'Sales Team', states={'done': [('readonly', True)]}, \
-                        select=True, help='Sales team to which Case belongs to.\
-                             Define Responsible user and Email account for mail gateway.'), 
+                        select=True, help='Sales team to which Case belongs to.'), 
         'email_from': fields.char('Email', size=128, states={'done': [('readonly', True)]}, help="These people will receive email."),
         'id': fields.integer('ID'),
         'create_date': fields.datetime('Creation Date' , readonly=True),
@@ -69,8 +68,7 @@ class crm_meeting(osv.osv, crm_case):
                                  'event_id', 'attendee_id', 'Attendees', states={'done': [('readonly', True)]}),
         'date_closed': fields.datetime('Closed', readonly=True),
         'date_deadline': fields.datetime('Deadline', states={'done': [('readonly', True)]}),
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
-        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'state': fields.selection([('open', 'Confirmed'),
                                     ('draft', 'Unconfirmed'),
                                     ('cancel', 'Cancelled'),
@@ -124,7 +122,21 @@ class crm_meeting(osv.osv, crm_case):
                     }
 
         return value
-    
+
+    def case_open(self, cr, uid, ids, *args):
+        """Confirms meeting
+        @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 Meeting Ids
+        @param *args: Tuple Value for additional Params
+        """
+        res = super(crm_meeting, self).case_open(cr, uid, ids, args)
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _('The Meeting') + " '" + name + "' "+ _("has been Confirmed.")
+            self.log(cr, uid, id, message)
+        return res
+
 crm_meeting()
 
 class calendar_attendee(osv.osv):
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 027ebed0a7a..311f8e2424f 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -52,6 +52,7 @@
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
+        <field name="help">The calendar of meetings is shared between sales teams and fully integrated with the others applications like the employee holidays. You can also synchronize meetings with your mobile phone using the caldav interface.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
@@ -105,7 +106,7 @@
          <field name="view_mode">tree,form</field>
          <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
         <field name="domain">[('ref','like','crm.meeting,')]</field>
-         <field name="context">{"search_default_user_id":uid}</field>
+         <field name="context">{"search_default_toreview":1, "search_default_user_id":uid}</field>
      </record>
 
     <menuitem id="menu_attendee_invitations"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 2c6fbd02cc9..3c04006447f 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -13,8 +13,8 @@
         <field name="context">{'object_id':'crm.meeting'}</field>
     </record>
 
-     <menuitem action="crm_meeting_categ_action" name="Categories"
-        id="menu_crm_case_meeting-act" parent="menu_crm_config_meeting" />
+     <menuitem action="crm_meeting_categ_action" name="Categories of Meeting"
+        id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/>
 
     <!-- CRM Meetings Form View -->
 
@@ -298,7 +298,7 @@
                            <field name="section_id" select="1" widget="selection">
                                <filter icon="terp-personal+"
                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                                   help="My Sale Team" />
+                                   help="My Sales Team(s)" />
                            </field>
                            <field name="user_id" select="1"/>
                        </group>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 0b672721ba3..c058732a3dd 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -36,8 +36,6 @@ AVAILABLE_STATES = [
 
 class crm_opportunity(osv.osv):
     """ Opportunity Cases """
-    _name = "crm.lead"
-    _description = "Opportunity"
     _order = "priority,date_action,id desc"
     _inherit = 'crm.lead'
     _columns = {
@@ -46,7 +44,7 @@ class crm_opportunity(osv.osv):
                                  domain="[('partner_id','=',partner_id)]"), 
 
         # Opportunity fields
-        'probability': fields.float('Probability (%)'),
+        'probability': fields.float('Probability (%)',group_operator="avg"),
         'planned_revenue': fields.float('Expected Revenue'),
         'ref': fields.reference('Reference', selection=crm._links_get, size=128),
         'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
@@ -72,8 +70,10 @@ class crm_opportunity(osv.osv):
 
         self.write(cr, uid, ids, value)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The Opportunity') + " '" + name + "' "+ _("has been written as Won.")
-            self.log(cr, uid, id, message)
+            opp = self.browse(cr, uid, id)
+            if opp.type == 'opportunity':
+                message = _('The Opportunity') + " '" + name + "' "+ _("has been Won.")
+                self.log(cr, uid, id, message)
         return res
 
     def case_mark_lost(self, cr, uid, ids, *args):
@@ -93,8 +93,10 @@ class crm_opportunity(osv.osv):
 
         res = self.write(cr, uid, ids, value)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The Opportunity') + " '" + name + "' "+ _("has been written as Lost.")
-            self.log(cr, uid, id, message)
+            opp = self.browse(cr, uid, id)
+            if opp.type == 'opportunity':
+                message = _('The Opportunity') + " '" + name + "' "+ _("has been Lost.")
+                self.log(cr, uid, id, message)
         return res
 
     def case_cancel(self, cr, uid, ids, *args):
@@ -150,6 +152,19 @@ class crm_opportunity(osv.osv):
             return {'value':{}}
         return {'value':{'probability': stage.probability}}
 
+    def onchange_assign_id(self, cr, uid, ids, partner_assigned_id, context={}):
+        """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,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of stage’s IDs
+            @stage_id: change state id on run time """
+
+        if not partner_assigned_id:
+            return {'value':{'date_assign': False}}
+        else:
+            return {'value':{'date_assign': time.strftime('%Y-%m-%d')}}
+
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 60ade626071..27d25e34ef9 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -30,6 +30,8 @@
           <field name="context">{'search_default_user_id':uid,'search_default_current':1, 'default_type': 'opportunity'}</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
+          <field name="help">Opportunities allows you to track your best deals pipeline: history of the communication, expected revenues, stage of each opportunity, excepted closings, etc. Opportunities are usually connected with the email gateway: new emails may create opportunities and each opportunity automatically gets the history of the conversation with the customer.
+          Your teams will be able to plan meeting and phonecalls from opportunities, to convert opportunities into quotations, to manage documents related to the opportunity, to track all activities related to this customer, etc.</field>
      </record>
 
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 5c3f3ffa8e1..ca094469c69 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,8 +14,7 @@
                             <group colspan="1" col="4">
                                 <field name="stage_id" nolabel="1"
                                 on_change="onchange_stage_id(stage_id)"
-                                widget="selection"
-                                domain="[('object_id.model', '=', 'crm.lead')]" />
+                                domain="[('section_id','=',section_id), ('object_id.model', '=', 'crm.lead')]" />
                                 <button name="stage_previous"
                                 states="open,pending" type="object"
                                 icon="gtk-go-back" string="" />
@@ -30,12 +29,14 @@
                             <field name="planned_revenue"/>
                             <field name="probability"/>
                             <field name="date_deadline" string="Expected Closing"/>
-                            <button string="Schedule Call"
-                            name="%(opportunity2phonecall_act)d" icon="gtk-redo" type="action"  />
+                            <button string="Schedule/Log Call"
+                            name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action"  />
                             <newline/>
                             <field name="date_action"/>
                             <field name="title_action"/>
                             <field name="priority" string="Priority"/>
+                            <button string="Merge with other Opportunity"
+                                name="%(merge_opportunity_act)d" icon="gtk-add" type="action" />
                             <newline/>
                             <field name="type" invisible="1"/>
                         </group>
@@ -117,11 +118,19 @@
                             </group>
                         </page>
 
-                        <page string="Emails" groups="base.group_extended">
+                        <page string="History" groups="base.group_extended">
                             <group colspan="4">
-                                <field colspan="4" name="email_cc" string="Cc" widget="char" size="512"/>
+                                <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree" height="280">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                                <tree string="Communication history">
+                                    <field name="display_text" string="History Information"/>
+                                    <button
+                                        string="Reply"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
+                                        icon="terp-mail-replied" type="action" />
+                                </tree>
                                 <form string="Communication history">
                                     <group col="4" colspan="4">
                                         <field name="email_from"/>
@@ -139,27 +148,21 @@
                                         </page>
                                     </notebook>
                                     <button colspan="4"
-                                    string="Reply to Last Email"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                    icon="gtk-undo" type="action" />
+                                        string="Reply"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
+                                        icon="terp-mail-replied" type="action" />
                                 </form>
-                                <tree string="Communication history">
-                                    <field name="date"/>
-                                    <field name="email_from" />
-                                    <field name="email_to"/>
-                                    <field name="description"/>
-                                </tree>
                             </field>
                             <button colspan="2" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.lead'}"
-                                icon="gtk-go-forward" type="action" />
-                            <button colspan="2" string="Forward to Partner"
+                                icon="terp-mail-message-new" type="action" />
+                            <button colspan="2" string="Forward"
                                 name="%(crm_lead_forward_to_partner_act)d"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-forward" type="action" />
                         </page>
-                        <page string="History" groups="base.group_extended">
+                        <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">
                                 <separator string="Dates" colspan="2"/>
                                 <field name="create_date"/>
@@ -177,19 +180,21 @@
                             <separator colspan="4" string="References"/>
                             <field name="ref"/>
                             <field name="ref2"/>
-                            <field name="log_ids" nolabel="1" colspan="4">
-                                <tree string="Logs">
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </tree>
-                                <form string="Logs">
-                                    <separator string="Action Information" colspan="4"/>
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </form>
-                            </field>
+                        </page>
+                        <page string="Assignation" groups="base.group_extended">
+                        <group name="partner_assign_group" col="5" colspan="4">
+                            <separator string="Partner Assignation" colspan="5"/>
+                            <field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)"/>
+                            <field name="date_assign"/>
+                            <group colspan="1" col="1">
+                                <button string="Forward"
+                                    attrs="{'invisible':[('partner_assigned_id','=',False)]}"
+                                    name="%(crm_lead_forward_to_partner_act)d"
+                                    icon="terp-mail-forward" type="action"
+                                    context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
+                                />
+                            </group>
+                        </group>
                         </page>
                         </notebook>
                     </form>
@@ -211,6 +216,7 @@
                         <field name="country_id" invisible="context.get('invisible_country', True)" />
                         <field name="date_action"/>
                         <field name="stage_id"/>
+                        <field name="partner_assigned_id" invisible="1"/>
                         <button name="stage_previous" string="Previous Stage"
                             states="open,pending" type="object" icon="gtk-go-back" />
                         <button name="stage_next" string="Next Stage"
@@ -296,14 +302,37 @@
                             <filter icon="terp-personal+"
                                 domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                 context="{'invisible_section': False}"
-                                help="My Sales Team" />
+                                help="My Sales Team(s)" />
                             <filter icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[]"
                                 help="Show Sales Team"/>
                         </field>
                         <newline/>
-                        <group  expand="0" string="Extended options..." groups="base.group_extended">
+                        <group expand="0" string="Group By..." colspan="16">
+                            <filter string="Stage" icon="terp-stage" domain="[]"
+                                context="{'group_by':'stage_id'}" />
+                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                            <filter string="Priority" icon="terp-rating-rated" domain="[]"
+                                context="{'group_by':'priority'}" />
+                            <filter string="Category" icon="terp-stock_symbol-selection"
+                                domain="[]" context="{'group_by':'categ_id'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Salesman" icon="terp-personal"
+                                domain="[]" context="{'group_by':'user_id'}" />
+                            <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                            <filter string="Assigned Partner" icon="terp-personal"
+                                domain="[]" context="{'group_by':'partner_assigned_id'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Creation" icon="terp-go-month"
+                                domain="[]" context="{'group_by':'create_date'}" />
+                            <filter string="Exp.Closing"
+                                icon="terp-go-month"
+                                help="Expected Closing" domain="[]"
+                                context="{'group_by':'date_deadline'}" />
+                        </group>
+                        <newline/>
+                        <group  expand="0" string="Extended Filters..." groups="base.group_extended">
                               <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                               <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                               <separator orientation="vertical"/>
@@ -316,28 +345,6 @@
                               <field name="create_date" string="Creation Date"/>
                               <field name="date_closed"/>
                         </group>
-                        <newline/>
-                        <group expand="0" string="Group By..." colspan="16">
-                            <filter string="Stage" icon="terp-stage" domain="[]"
-                                context="{'group_by':'stage_id'}" />
-                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                            <filter string="Priority" icon="terp-rating-rated" domain="[]"
-                                context="{'group_by':'priority'}" />
-                            <filter string="Category" icon="terp-stock_symbol-selection"
-                                domain="[]" context="{'group_by':'categ_id'}" />
-
-                            <separator orientation="vertical" />
-                            <filter string="Salesman" icon="terp-personal"
-                                domain="[]" context="{'group_by':'user_id'}" />
-                            <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                            <separator orientation="vertical" />
-                            <filter string="Creation" icon="terp-go-month"
-                                domain="[]" context="{'group_by':'create_date'}" />
-                            <filter string="Exp.Closing"
-                                icon="terp-go-month"
-                                help="Expected Closing" domain="[]"
-                                context="{'group_by':'date_deadline'}" />
-                        </group>
                     </search>
                 </field>
             </record>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 05413ddcd8f..61bb4f3751e 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -41,8 +41,7 @@ class crm_phonecall(osv.osv, crm_case):
         'date_action_next': fields.datetime('Next Action', readonly=1), 
         'create_date': fields.datetime('Creation Date' , readonly=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
-                        select=True, help='Sales team to which Case belongs to.\
-                             Define Responsible user and Email account for mail gateway.'), 
+                        select=True, help='Sales team to which Case belongs to.'), 
         'user_id': fields.many2one('res.users', 'Responsible'), 
         'partner_id': fields.many2one('res.partner', 'Partner'), 
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
@@ -83,8 +82,7 @@ class crm_phonecall(osv.osv, crm_case):
         'date_closed': fields.datetime('Closed', readonly=True), 
         'date': fields.datetime('Date'), 
         'opportunity_id': fields.many2one ('crm.lead', 'Opportunity'), 
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
-        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }
 
     _defaults = {
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 9beb4f4c0c4..481e92ec134 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -12,7 +12,7 @@
         domain="[('partner_id', '=', active_id)]"
         groups="base.group_extended"
         />
-    
+
     <act_window
             id="act_crm_phonecall_crm_meeting_new"
             name="Meetings"
@@ -69,6 +69,8 @@
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
         <field name="context" eval="'{\'set_editable\':True,\'default_state\':\'open\', \'search_default_current\':1,\'search_default_today\':1, \'default_categ_id\': ' + str(ref('categ_phone1')) +'}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
+        <field name="help">Trace easily all your Inbound calls. The Inbound menu open a search view in editable mode, so you can easily modify or add a new call record. With the actions buttons convert a lead into an opportunity or plan a meeting.</field>
+
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
@@ -105,6 +107,7 @@
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
         <field name="context" eval="'{\'default_state\':\'open\', \'search_default_current\':1, \'default_categ_id\': ' + str(ref('categ_phone2')) +'}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
+        <field name="help">The Outbound menu open a search view in editable mode, so you can easily modify or plan a new call. Actions buttons allows you to to make you call status evolved for a better follow up of your planned calls. During calls, convert your lead into an opportunity, plan a meeting or canceled it.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 702be16dbea..652e17df061 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -38,13 +38,14 @@
         <field name="model">crm.phonecall</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Phone Calls" colors="grey:state in ('cancel','done');blue:state in ('pending',)">
+            <tree colors="gray:state in ('cancel','done');blue:state in ('pending',)" string="Phone Calls">
                 <field name="date" string="Date"/>
                 <field name="name" string="Call Summary"/>
                 <field name="partner_id" string="Partner"/>
                 <field name="partner_contact"/>
                 <field name="partner_phone"/>
                 <field name="user_id"/>
+                <field name="categ_id" string="Type"/>
                 <button string="Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"
@@ -107,6 +108,9 @@
                 </group>
                 <group col="2" colspan="2">
                     <separator colspan="2" string="Categorization" />
+                    <field name="categ_id" widget="selection"
+                        domain="[('object_id.model', '=', 'crm.phonecall')]"
+                        string="Type" />
                     <field name="priority"/>
                     <field name="opportunity_id"/>
                 </group>
@@ -182,6 +186,9 @@
                 </group>
                 <group col="2" colspan="2">
                     <separator colspan="2" string="Categorization" />
+                    <field name="categ_id" widget="selection"
+                        domain="[('object_id.model', '=', 'crm.phonecall')]"
+                        string="Type" />
                     <field name="priority"/>
                     <field name="opportunity_id"/>
                 </group>
@@ -209,6 +216,9 @@
                         on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                 <field name="partner_phone"/>
                 <field name="user_id"/>
+                <field name="categ_id" widget="selection"
+                	domain="[('object_id.model', '=', 'crm.phonecall')]"
+                	string="Type" />
                 <field name="state" invisible="1"/>
                 <field name="create_date" invisible="1"/>
                 <button string="Opportunity"
@@ -274,7 +284,7 @@
                    select="1" widget="selection" string="Sales Team">
                    <filter icon="terp-personal+"
                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="My Sale Team" />
+                       help="My Sales Team(s)" />
                </field>
                <newline/>
                <group expand="0" string="Group By..." colspan="4">
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 61da1ab6cc9..41375001257 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,14 +2,14 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_crm_config_sales" name="Sales"
-            parent="base.menu_base_config" sequence="1"/>
+        <!--menuitem id="base.menu_crm_config_sales" name="Sales"
+            parent="base.menu_base_config" sequence="1"/-->
 
-        <menuitem id="menu_crm_config_lead" name="Leads &amp; Opportunities"
-            parent="base.menu_crm_config_sales" sequence="0" groups="base.group_extended"/>
+        <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
+            parent="base.menu_base_config" sequence="2" groups="base.group_extended"/>
 
-        <menuitem id="menu_crm_config_meeting" name="Meeting"
-            parent="base.menu_base_config" sequence="4"/>
+        <!--menuitem id="menu_crm_config_meeting" name="Meeting"
+            parent="base.menu_base_config" sequence="4"/-->
 
         <menuitem id="menu_crm_config_phonecall" name="Phone Call"
             parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
@@ -17,11 +17,11 @@
         <menuitem id="base.next_id_64" name="Reporting"
             parent="base.menu_base_partner" sequence="11" />
 
-        <menuitem action="crm_custom_create_menu_action"
+        <!--menuitem action="crm_custom_create_menu_action"
             id="crm_case_create_custom_menu"
             parent="base.menu_crm_config_sales"
             groups="base.group_extended"
-            name="Create Menu for Custom Cases" />
+            name="Create Menu for Custom Cases" /-->
 
 
         <!-- Case Sections Form View -->
@@ -90,7 +90,7 @@
         
         <menuitem action="crm_case_section_act"
             id="menu_crm_case_section_act" sequence="4"
-            parent="menu_crm_config_lead" />
+            parent="base.menu_crm_config_lead" />
             
 
         <!-- CRM Stage Tree View -->
@@ -180,7 +180,7 @@
         
          <menuitem action="crm_case_categ-act"
             id="menu_crm_case_categ-act" name="Categories"
-            parent="menu_crm_config_lead" sequence="1"/>
+            parent="base.menu_crm_config_lead" sequence="1"/>
 
         <!-- Resource Type of case Tree View -->
 
@@ -229,26 +229,6 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
 
-        <!-- Cases Tree View  -->
-
-        <record id="crm_case_log_tree-view" model="ir.ui.view">
-            <field name="name">crm.case.log.tree</field>
-            <field name="model">crm.case.log</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Case logs">
-                    <field name="date"/>
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="section_id"/>
-                    <!--
-                    <field name="som"/>
-                    <field name="canal_id"/>
-                    -->
-                </tree>
-            </field>
-        </record>
-
         <!-- Segmentation line Tree View  -->
 
         <record id="crm_segmentation_line_tree-view" model="ir.ui.view">
@@ -354,7 +334,7 @@
         </record>
 
         <record id="crm_segmentation_tree-act" model="ir.actions.act_window">
-            <field name="name">Segmentation</field>
+            <field name="name">Partners Segmentation</field>
             <field name="res_model">crm.segmentation</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -362,8 +342,8 @@
 
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
-            groups="base.group_extended" sequence="3"
-            parent="base.menu_config_address_book" />
+            groups="base.group_extended" sequence="2"
+            parent="base.menu_base_action_rule" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
             <field name="name">view.users.form.crm.modif.inherited1</field>
@@ -374,7 +354,8 @@
                 <page string="Current Activity" position="inside">
                     <field name="context_section_id" completion="1"
                         widget="selection"
-                        context="{'user_prefence':True}" />
+                        context="{'user_prefence':True}" 
+                        readonly="0"/>
                 </page>
             </field>
         </record>
@@ -563,61 +544,50 @@
                             <field name="active" select="2"/>
                             <separator colspan="4" string="References"/>
                             <field colspan="4" name="ref"/>
-                            <field colspan="4" name="log_ids" nolabel="1">
-                                <tree string="Logs">
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </tree>
-                                <form string="Logs">
-                                    <separator string="Action Information" colspan="4"/>
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </form>
-                            </field>
                         </page>
                         <page string="Emails" groups="base.group_extended">
                            <group colspan="4">
-                               <field colspan="4" name="email_cc" string="CC" widget="char" size="512"/>
+                               <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
                            </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
-                                <form string="Communication history">
-                                    <group col="4" colspan="4">
-                                        <field name="email_from"/>
-                                        <field name="date"/>
-                                        <field name="email_to" widget="char" size="512"/>
-                                        <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Details">
-                                            <field name="description" colspan="4" nolabel="1"/>
-                                        </page>
-                                        <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                    <button colspan="4"
-                                    string="Reply"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'crm.case.custom', 'include_original' : True}"
-                                    icon="gtk-undo" type="action" />
-                                </form>
-                                <tree string="Communication history">
-                                    <field name="date"/>
-                                    <field name="email_from" />
-                                    <field name="email_to"/>
-                                    <field name="description"/>
-                                </tree>
-                            </field>
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+		                        <tree string="Communication history">
+		                            <field name="display_text" string="History Information"/>
+		                            <button
+		                                string="Reply"
+		                                name="%(crm.action_crm_send_mail)d"
+		                                context="{'mail':'reply', 'model': 'crm.case.custom', 'include_original' : True}"
+		                                icon="terp-mail-replied" type="action" />
+		                        </tree>
+		                        <form string="Communication history">
+		                            <group col="4" colspan="4">
+		                                <field name="email_from"/>
+		                                <field name="date"/>
+		                                <field name="email_to" widget="char" size="512"/>
+		                                <field name="email_cc" widget="char" size="512"/>
+		                                <field name="name" colspan="4" widget="char" size="512"/>
+		                            </group>
+		                            <notebook colspan="4">
+		                                <page string="Details">
+		                                    <field name="description" colspan="4" nolabel="1"/>
+		                                </page>
+		                                <page string="Attachments">
+		                                    <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+		                                </page>
+		                            </notebook>
+		                            <button colspan="4"
+		                                string="Reply"
+		                                name="%(crm.action_crm_send_mail)d"
+		                                context="{'mail':'reply', 'model': 'crm.case.custom', 'include_original' : True}"
+		                                icon="terp-mail-replied" type="action" />
+		                        </form>
+		                    </field>
                             <button colspan="2" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.case.custom'}"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-message-new" type="action" />
                             <button colspan="2" string="Forward to Partner"
                                 name="%(crm_lead_forward_to_partner_act)d"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-forward" type="action" />
                          </page>
                     </notebook>
                 </form>
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index fa1b967cea8..6c520fe6514 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-06-28 22:26+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
+"PO-Revision-Date: 2010-07-18 17:30+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-06-30 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -94,9 +95,7 @@ msgstr "Nombre de fase"
 #. module: crm
 #: view:crm.case:0
 #: view:crm.case.history:0
-#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
 #: model:ir.actions.act_window,name:crm.crm_case_section_open_act
-#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_51
 msgid "Cases"
 msgstr "Casos"
@@ -147,9 +146,6 @@ msgstr "Reparado"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/crm_job_wizard.py:0
-#: code:addons/crm/wizard/crm_lead_wizard.py:0
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
 msgstr "Advertencia !"
@@ -206,30 +202,16 @@ msgstr ""
 "correo para correo de salida."
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,partner_id:0
-#: model:crm.case.categ,name:crm.categ_lead4
-#: model:crm.case.categ,name:crm.categ_oppor4
-#: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
 #: field:crm.case.rule,trg_partner_id:0
-#: selection:crm.email.add.cc,name:0
-#: field:crm.email.add.cc,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
-#: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: crm
 #: field:crm.case.categ,section_id:0
-#: field:crm.case.category2,section_id:0
 #: view:crm.case.section:0
 #: field:crm.case.section,name:0
-#: field:crm.case.stage,section_id:0
+#: wizard_field:crm.case.section.menu,init,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
 msgstr "Sección del caso"
@@ -284,7 +266,8 @@ msgid "Send New Email"
 msgstr "Enviar nuevo correo eléctronico"
 
 #. module: crm
-#: view:crm.case.history:0
+#: model:ir.actions.act_window,name:crm.crm_case_history_my-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_history_my-act
 msgid "My Histories"
 msgstr "Mis historias"
 
@@ -340,15 +323,10 @@ msgstr "Categorías"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Warning!"
-msgstr "Advertencia!"
+msgstr "¡Aviso!"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Dates"
 msgstr "Fechas"
 
@@ -430,7 +408,6 @@ msgid "Exception Rules"
 msgstr "Reglas de Excepción"
 
 #. module: crm
-#: field:crm.menu.config_wizard,opportunity:0
 #: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
 msgid "Business Opportunities"
 msgstr "Oportunidades de negocio"
@@ -484,12 +461,6 @@ msgstr "Particular"
 #. module: crm
 #: field:crm.case,categ_id:0
 #: field:crm.case.rule,trg_categ_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
-#: view:crm.opportunity:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
-#: field:report.crm.case.section.categ.categ2,categ_id:0
-#: field:report.crm.case.section.categ.stage,categ_id:0
-#: field:report.crm.case.section.stage,categ_id:0
 msgid "Category"
 msgstr "Categoría"
 
@@ -521,11 +492,6 @@ msgstr "%(partner)s = Nombre empresa"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Action Information"
 msgstr "Información de la acción"
 
@@ -554,15 +520,14 @@ msgstr "Condiciones"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act_open
 msgid "Open Cases"
 msgstr "Casos abiertos"
 
 #. module: crm
-#: field:crm.case.log,name:0
-#: view:crm.claim:0
-#: view:crm.job:0
+#: field:crm.case,state:0
 msgid "Status"
-msgstr "Posición"
+msgstr "Estado"
 
 #. module: crm
 #: wizard_view:crm.case.opportunity.partner_opportunity,init:0
@@ -592,9 +557,6 @@ msgstr "Árbol de reuniones"
 #: view:crm.case:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
 msgstr "Escalado"
@@ -712,8 +674,6 @@ msgstr "Política de reclamaciones"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
@@ -759,11 +719,6 @@ msgstr "Setiembre"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Communication history"
 msgstr "Historial de comunicación"
 
@@ -1191,10 +1146,8 @@ msgid "Next Action"
 msgstr "Próxima acción"
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,date_deadline:0
 #: selection:crm.case.rule,trg_date_type:0
-#: view:crm.opportunity:0
 msgid "Deadline"
 msgstr "Fecha límite"
 
@@ -1371,12 +1324,6 @@ msgstr "%(partner_email)s = Email empresa"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
 msgid "Reset to Draft"
 msgstr "Cambiar a borrador"
 
@@ -1589,8 +1536,6 @@ msgstr "Esperando respuesta"
 #: field:crm.case,date:0
 #: field:crm.case.log,date:0
 #: selection:crm.case.rule,trg_date_type:0
-#: view:crm.claim:0
-#: view:crm.phonecall:0
 msgid "Date"
 msgstr "Fecha"
 
@@ -1637,11 +1582,6 @@ msgstr "Dando la ubicacion de la reunion"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "History"
 msgstr "Historial"
 
@@ -1676,40 +1616,18 @@ msgstr "Enviar recordatorio"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "References"
 msgstr "Referencias"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
-#: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
-#: view:crm.claim:0
-#: view:crm.claim.assign_wizard:0
-#: view:crm.fundraising:0
-#: view:crm.helpdesk.assign_wizard:0
-#: wizard_button:crm.job.meeting_set,init,end:0
-#: wizard_button:crm.job.partner_create,init,end:0
-#: wizard_button:crm.job.reschedule_phone_call,init,end:0
-#: view:crm.lead:0
-#: wizard_button:crm.lead.opportunity_set,create_partner,end:0
-#: wizard_button:crm.lead.opportunity_set,opportunity,end:0
-#: wizard_button:crm.lead.partner_create,init,end:0
-#: view:crm.meeting.generic_wizard:0
-#: wizard_button:crm.new.send.mail,init,end:0
-#: view:crm.opportunity:0
-#: view:crm.opportunity.assign_wizard:0
-#: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
-#: view:crm.phonecall:0
-#: view:crm.phonecall.assign_wizard:0
-#: wizard_button:crm.phonecall.meeting_set,init,end:0
-#: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
-#: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
-#: wizard_button:crm.phonecall.partner_create,init,end:0
-#: wizard_button:crm.send.mail,init,end:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
+#: wizard_button:crm.case.section.menu,design_menu,end:0
+#: wizard_button:crm.case.section.menu,init,end:0
 #, python-format
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1824,9 +1742,6 @@ msgid "="
 msgstr "="
 
 #. module: crm
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
 msgstr "Nombre"
@@ -1880,11 +1795,6 @@ msgstr "Seguimiento de errores"
 #. module: crm
 #: view:crm.case:0
 #: view:crm.case.rule:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Actions"
 msgstr "Acciones"
 
@@ -2151,17 +2061,12 @@ msgstr "Estado del caso"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Send"
 msgstr "Enviar"
 
 #. module: crm
 #: field:crm.case,priority:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -2207,11 +2112,6 @@ msgstr "Programar una reunión normal o telefónica"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/crm_claim.py:0
-#: code:addons/crm/crm_helpdesk.py:0
-#: code:addons/crm/crm_meeting.py:0
-#: code:addons/crm/crm_opportunity.py:0
-#: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -2461,14 +2361,6 @@ msgstr "Bajo"
 
 #. module: crm
 #: field:crm.case,date_closed:0
-#: selection:crm.case,state:0
-#: selection:crm.case.rule,act_state:0
-#: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
@@ -2655,8 +2547,7 @@ msgstr ""
 "Está seguro de que desea crear una empresa basada en esta solicitud laboral ?"
 
 #. module: crm
-#: wizard_field:crm.lead.opportunity_set,create_partner,action:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
+#: field:crm.case.log,name:0
 msgid "Action"
 msgstr "Acción"
 
@@ -2704,7 +2595,6 @@ msgstr "Ventas"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.phonecall:0
 msgid "General"
 msgstr "General"
 
@@ -2751,16 +2641,6 @@ msgstr "Todas las oportunidades"
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Open"
 msgstr "Abierto"
@@ -2798,16 +2678,6 @@ msgstr "Asistencia/Ayuda"
 #. module: crm
 #: field:crm.case,user_id:0
 #: field:crm.case.rule,trg_user_id:0
-#: view:crm.claim:0
-#: field:crm.claim.assign_wizard,user_id:0
-#: view:crm.fundraising:0
-#: field:crm.helpdesk.assign_wizard,user_id:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: field:crm.meeting.generic_wizard,user_id:0
-#: view:crm.opportunity:0
-#: field:crm.opportunity.assign_wizard,user_id:0
-#: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
 msgstr "Responsable"
 
@@ -3050,6 +2920,8 @@ msgid "Jobs Hiring Process"
 msgstr "Proceso de selección de personal"
 
 #. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_52
 msgid "All Cases"
 msgstr "Todos los casos"
@@ -3171,7 +3043,6 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -3262,17 +3133,6 @@ msgstr "%(case_subject)s = Asunto del caso"
 #: field:crm.case,section_id:0
 #: field:crm.case.log,section_id:0
 #: field:crm.case.rule,trg_section_id:0
-#: field:crm.claim.assign_wizard,section_id:0
-#: field:crm.helpdesk.assign_wizard,section_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,section_id:0
-#: field:crm.meeting.generic_wizard,section_id:0
-#: field:crm.opportunity.assign_wizard,section_id:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,section_id:0
-#: field:crm.phonecall.assign_wizard,section_id:0
-#: field:report.crm.case.section.categ.categ2,section_id:0
-#: field:report.crm.case.section.categ.stage,section_id:0
-#: field:report.crm.case.section.categ2,section_id:0
-#: field:report.crm.case.section.stage,section_id:0
 msgid "Section"
 msgstr "Sección"
 
@@ -3303,10 +3163,7 @@ msgid "Your action"
 msgstr "Su acción"
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_lead3
 #: field:crm.case.history,email:0
-#: field:crm.email.add.cc,email:0
-#: view:crm.job:0
 msgid "Email"
 msgstr "Email"
 
@@ -3363,16 +3220,6 @@ msgstr "Informes"
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0
-#: view:crm.opportunity:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Pending"
 msgstr "Pendiente"
@@ -3519,9 +3366,23 @@ msgid "All Funds"
 msgstr "Todos los fondos"
 
 #. module: crm
-#: field:crm.case.section,calendar:0
-#: view:crm.meeting:0
-#: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
+#: selection:crm.case.section.menu,design_menu,menu10_option:0
+#: selection:crm.case.section.menu,design_menu,menu11_option:0
+#: selection:crm.case.section.menu,design_menu,menu12_option:0
+#: selection:crm.case.section.menu,design_menu,menu13_option:0
+#: selection:crm.case.section.menu,design_menu,menu14_option:0
+#: selection:crm.case.section.menu,design_menu,menu15_option:0
+#: selection:crm.case.section.menu,design_menu,menu16_option:0
+#: selection:crm.case.section.menu,design_menu,menu17_option:0
+#: selection:crm.case.section.menu,design_menu,menu1_option:0
+#: selection:crm.case.section.menu,design_menu,menu2_option:0
+#: selection:crm.case.section.menu,design_menu,menu3_option:0
+#: selection:crm.case.section.menu,design_menu,menu4_option:0
+#: selection:crm.case.section.menu,design_menu,menu5_option:0
+#: selection:crm.case.section.menu,design_menu,menu6_option:0
+#: selection:crm.case.section.menu,design_menu,menu7_option:0
+#: selection:crm.case.section.menu,design_menu,menu8_option:0
+#: selection:crm.case.section.menu,design_menu,menu9_option:0
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -3567,6 +3428,7 @@ msgstr "Saliente"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #, python-format
 msgid "Historize"
 msgstr "Añadir al historial"
@@ -3594,11 +3456,6 @@ msgstr "Probabilidad de éxito"
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.meeting:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Draft"
 msgstr "Borrador"
@@ -3628,8 +3485,6 @@ msgstr "Normal"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
 msgstr "¡Debe indicar un Email de empresa para usar esta acción!"
@@ -3772,8 +3627,6 @@ msgstr "Fase del caso"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.opportunity:0
 msgid "Estimates"
 msgstr "Estimaciones"
 
@@ -3785,6 +3638,10 @@ msgstr "Usuario responsable"
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
 #, python-format
 msgid "Close"
 msgstr "Cerrado"
@@ -3842,14 +3699,9 @@ msgid "% = The '%' Character"
 msgstr "% = EL '%' caracter"
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,name:0
 #: field:crm.case.history,description:0
 #: field:crm.case.history,note:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
 #: field:crm.segmentation,description:0
 msgid "Description"
 msgstr "Descripción"
@@ -3900,14 +3752,6 @@ msgstr "_Importar"
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: field:crm.case.log,case_id:0
-#: field:crm.claim,inherit_case_id:0
-#: field:crm.fundraising,inherit_case_id:0
-#: field:crm.helpdesk,inherit_case_id:0
-#: field:crm.job,inherit_case_id:0
-#: field:crm.lead,inherit_case_id:0
-#: field:crm.meeting,inherit_case_id:0
-#: field:crm.opportunity,inherit_case_id:0
-#: field:crm.phonecall,inherit_case_id:0
 #: model:ir.model,name:crm.model_crm_case
 #: model:res.request.link,name:crm.req_link_case
 #, python-format
@@ -4031,7 +3875,6 @@ msgstr "Exportar archivo ICS"
 #. module: crm
 #: field:crm.case.rule,sequence:0
 #: field:crm.case.section,sequence:0
-#: field:crm.case.stage,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
@@ -4202,9 +4045,6 @@ msgstr "Boletín de noticias"
 #~ msgid "List"
 #~ msgstr "Lista"
 
-#~ msgid "Send Partner & Historize"
-#~ msgstr "Enviar empresa & Añadir historial"
-
 #~ msgid "All Histories"
 #~ msgstr "Todos los historiales"
 
@@ -4217,9 +4057,6 @@ msgstr "Boletín de noticias"
 #~ msgid "Mail to watchers (Cc)"
 #~ msgstr "Enviar correo a observadores (CC)"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
-
 #~ msgid "Deadline Date is automatically computed from Start Date + Duration"
 #~ msgstr ""
 #~ "La fecha límite se calcula automáticamente a partir de Fecha de inicio + "
@@ -4233,3 +4070,6 @@ msgstr "Boletín de noticias"
 #~ msgstr ""
 #~ "Es posible que desee crear un nuevo menú padre para poner todos los menús "
 #~ "creados en él."
+
+#~ msgid "Send Partner & Historize"
+#~ msgstr "Enviar a empresa y añadir al historial"
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index 6ab7e697a5c..c949dec0238 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* crm
-#
+# * crm
+# Giedrius Slavinskas <giedrius.slavinskas@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2009-12-12 12:18+0000\n"
-"Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.com>\n"
+"PO-Revision-Date: 2010-07-21 10:38+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-06-22 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: lt\n"
 
 #. module: crm
 #: field:crm.email.add.cc,name:0
@@ -70,7 +71,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
 msgid "Button Pressed"
-msgstr "Mygtukas paspaustas"
+msgstr "Nuspaustas mygtukas"
 
 #. module: crm
 #: view:crm.case:0
@@ -90,12 +91,10 @@ msgstr ""
 #. module: crm
 #: view:crm.case:0
 #: view:crm.case.history:0
-#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
 #: model:ir.actions.act_window,name:crm.crm_case_section_open_act
-#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_51
 msgid "Cases"
-msgstr "Klausimai"
+msgstr "Įvykiai"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -103,6 +102,8 @@ 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
 #: model:ir.ui.menu,name:crm.menu_hr
@@ -139,12 +140,9 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/crm_job_wizard.py:0
-#: code:addons/crm/wizard/crm_lead_wizard.py:0
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
-msgstr "Įspėjimas!"
+msgstr "Perspėjimas!"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
@@ -194,33 +192,19 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,partner_id:0
-#: model:crm.case.categ,name:crm.categ_lead4
-#: model:crm.case.categ,name:crm.categ_oppor4
-#: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
 #: field:crm.case.rule,trg_partner_id:0
-#: selection:crm.email.add.cc,name:0
-#: field:crm.email.add.cc,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
-#: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
 msgstr "Partneris"
 
 #. module: crm
 #: field:crm.case.categ,section_id:0
-#: field:crm.case.category2,section_id:0
 #: view:crm.case.section:0
 #: field:crm.case.section,name:0
-#: field:crm.case.stage,section_id:0
+#: wizard_field:crm.case.section.menu,init,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
-msgstr "Klausimo sekcija"
+msgstr "Įvykio sekcija"
 
 #. module: crm
 #: view:crm.job:0
@@ -248,17 +232,17 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
 msgid "Mail to these emails"
-msgstr "Rašyti šiems adresatams"
+msgstr "Išsiųsti el. paštą adresams"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
 msgid "None"
-msgstr "Niekas"
+msgstr "Nėra"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Special Keywords to Be Used in The Body"
-msgstr "Specialūs raktažodžiai, skirti naudoti žinutėje"
+msgstr "Specialūs raktažodžiai naudojami tekste"
 
 #. module: crm
 #: view:crm.case:0
@@ -271,9 +255,10 @@ msgid "Send New Email"
 msgstr ""
 
 #. module: crm
-#: view:crm.case.history:0
+#: model:ir.actions.act_window,name:crm.crm_case_history_my-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_history_my-act
 msgid "My Histories"
-msgstr "Mano istorijos"
+msgstr "Mano įvykių istorija"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -299,7 +284,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
 msgid "Last Action Date"
-msgstr "Paskutinio veiksmo data"
+msgstr "Paskutinė veiksmo data"
 
 #. module: crm
 #: view:crm.job:0
@@ -330,18 +315,13 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Dates"
 msgstr "Datos"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr "Segmentacijos testavimas"
+msgstr "Segmentacijos testas"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -368,7 +348,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
 msgid "Delay type"
-msgstr "Delsos tipas"
+msgstr "Uždelsimo tipas"
 
 #. module: crm
 #: view:crm.claim:0
@@ -414,7 +394,6 @@ msgid "Exception Rules"
 msgstr ""
 
 #. module: crm
-#: field:crm.menu.config_wizard,opportunity:0
 #: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
 msgid "Business Opportunities"
 msgstr "Verslo galimybės"
@@ -430,11 +409,13 @@ msgid ""
 "The rule use a AND operator. The case must match all non empty fields so "
 "that the rule execute the action described in the 'Actions' tab."
 msgstr ""
+"Taisyklė naudoja IR operatorių. Įvykis turi atitikti visus ne tuščius "
+"laukus, kad taisyklė atliktų veiksmą, apibūdintą 'Veiksmai' kortelėje."
 
 #. module: crm
 #: field:crm.case,history_line:0
 msgid "Communication"
-msgstr "Komunikacija"
+msgstr "Ryšiai"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -465,12 +446,6 @@ msgstr ""
 #. module: crm
 #: field:crm.case,categ_id:0
 #: field:crm.case.rule,trg_categ_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
-#: view:crm.opportunity:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
-#: field:report.crm.case.section.categ.categ2,categ_id:0
-#: field:report.crm.case.section.categ.stage,categ_id:0
-#: field:report.crm.case.section.stage,categ_id:0
 msgid "Category"
 msgstr "Kategorija"
 
@@ -496,28 +471,24 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(partner)s = Partner name"
-msgstr "%(partner)s = Partnerio vardas"
+msgstr "%(partner)s = Partnerio pavadinimas"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Action Information"
 msgstr "Veiksmo informacija"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_user_phone)s = Responsible phone"
-msgstr "%(case_user_phone)s = Atsakingo telefonas"
+msgstr "%(case_user_phone)s = Atsakingo asmens telefonas"
 
 #. 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
 #: constraint:ir.actions.act_window:0
@@ -531,15 +502,14 @@ msgstr "Sąlygos"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act_open
 msgid "Open Cases"
-msgstr "Atviri klausimai"
+msgstr "Atviri įvykiai"
 
 #. module: crm
-#: field:crm.case.log,name:0
-#: view:crm.claim:0
-#: view:crm.job:0
+#: field:crm.case,state:0
 msgid "Status"
-msgstr "Būklė"
+msgstr "Būsena"
 
 #. module: crm
 #: wizard_view:crm.case.opportunity.partner_opportunity,init:0
@@ -569,12 +539,9 @@ msgstr ""
 #: view:crm.case:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
-msgstr "Plėtoti"
+msgstr "Plėtojama"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
@@ -584,7 +551,7 @@ msgstr ""
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
 msgid "Customer & Supplier Relationship Management"
-msgstr "Klientų ir tiekėjų santykių valdymas"
+msgstr "Ryšių su klientais ir tiekėjais valdymas"
 
 #. module: crm
 #: view:crm.email.add.cc:0
@@ -603,7 +570,7 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr "Numatytasys (0=Nieko)"
+msgstr "Numatytasis (0=Nieko)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job7
@@ -636,7 +603,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_id)s = Case ID"
-msgstr "%(case_id)s = Klausimo ID"
+msgstr "%(case_id)s = Įvykio ID"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
@@ -670,7 +637,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr "Klausimo kategorija"
+msgstr "Įvykio kategorija"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@@ -678,6 +645,9 @@ 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 ""
+"Numatytoji nuotaika naudojama dėl periodo apdorojimo ir \"Maksimalus "
+"intervalas\" skaičiavimo. Tai pradinė būsena pagal nutylėjimą, jei partneris "
+"neturi įvykių."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim3
@@ -686,12 +656,12 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
 msgstr ""
+"Jūs turite nurodyti atsakingą naudotoją šiam įvykiui, norint įgyvendinti šį "
+"veiksmą!"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -701,7 +671,7 @@ msgstr ""
 #. module: crm
 #: view:res.partner.events:0
 msgid "Partner Events"
-msgstr "Partnerio renginiai"
+msgstr "Partnerio įvykiai"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job4
@@ -731,11 +701,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Communication history"
 msgstr "Komunikavimo istorija"
 
@@ -773,7 +738,7 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr "Partnerio segmentacijos eilutės"
+msgstr "Partnerių segmentavimo eilutės"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
@@ -789,7 +754,7 @@ msgstr ""
 #: view:crm.segmentation:0
 #: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr "Partnerio segmentacija"
+msgstr "Partnerio segmentavimas"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job5
@@ -823,12 +788,14 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 "cases in this section"
 msgstr ""
+"El. pašto adresu įrašytu į \"Atsakyti (kam)\" siunčiami visi el. laiškai "
+"išsiųsti Open ERP apie įvykius iš šios sekcijos."
 
 #. module: crm
 #: view:crm.case.rule:0
 #: model:ir.model,name:crm.model_crm_case_rule
 msgid "Case Rule"
-msgstr "Klausimo taisyklė"
+msgstr "Įvykio taisyklė"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -881,12 +848,12 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Periode"
-msgstr "Dienų per periodą"
+msgstr "Dienų skaičius periode"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
 msgid "Value"
-msgstr "Reikšmė"
+msgstr "Vertė"
 
 #. module: crm
 #: help:caldav.crm.export,init,name:0
@@ -906,11 +873,14 @@ msgid ""
 "criterions. If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"Pažymėkite, jeigu kategorija yra limituojama partneriams, kurie atitinka "
+"segmentavimo kriterijus. Jeigu pažymėta, pašalina kategoriją iš partnerių, "
+"kurie neatitinka segmentacijos kriterijų."
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr "Ypatingas"
+msgstr "Išorinis"
 
 #. module: crm
 #: help:crm.case,categ_id:0
@@ -922,7 +892,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_state:0
 msgid "Set state to"
-msgstr "Nustatyti būklę į"
+msgstr "Nustatyti būseną"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -943,12 +913,12 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on States"
-msgstr ""
+msgstr "Būsenų sąlygos"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_type:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Iškilusios problemos data"
 
 #. module: crm
 #: view:crm.case.history:0
@@ -982,12 +952,12 @@ msgstr "Partnerio kategorija"
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
 msgid "Use The Sales Purchase Rules"
-msgstr "Naudoti pardavimų/pirkimų taisykles"
+msgstr "Naudoti pirkimų/pardavimų taisykles"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr "Pirkimo suma"
+msgstr "Pirkimų suma"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -1082,7 +1052,7 @@ msgstr "Planuojamos išlaidos"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_history
 msgid "Case history"
-msgstr "Klausimo istorija"
+msgstr "Įvykio istorija"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job2
@@ -1097,7 +1067,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.categ,name:0
 msgid "Case Category Name"
-msgstr "Klausimo kategorijos pavadinimas"
+msgstr "Įvykio kategorijos pavadinimas"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
@@ -1129,6 +1099,8 @@ msgstr ""
 msgid ""
 "Check this if you want the rule to send a reminder by email to the partner."
 msgstr ""
+"Pažymėkite, jeigu norite taisyklės, kuri siunčia partneriui priminimą el. "
+"paštu."
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:0
@@ -1143,7 +1115,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Case Fields"
-msgstr ""
+msgstr "Įvykio laukų sąlygos"
 
 #. module: crm
 #: field:crm.case,date_action_next:0
@@ -1151,10 +1123,8 @@ msgid "Next Action"
 msgstr "Kitas veiksmas"
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,date_deadline:0
 #: selection:crm.case.rule,trg_date_type:0
-#: view:crm.opportunity:0
 msgid "Deadline"
 msgstr "Galutinis terminas"
 
@@ -1173,7 +1143,7 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "Partnerio segmentacijos"
+msgstr "Partnerio segmentavimai"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1183,7 +1153,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of case"
-msgstr "Klausimo kategorija"
+msgstr "Kategorija pagal įvykį"
 
 #. module: crm
 #: field:crm.email.add.cc,subject:0
@@ -1227,6 +1197,27 @@ msgid ""
 "The CRM module has a email gateway for the synchronisation interface\n"
 "between mails and Open ERP."
 msgstr ""
+"Open ERP CRM\n"
+"sistema leidžia grupei žmonių protingai ir veiksmingai valdyti\n"
+"klientų galimybes, užduotis, klausimus, prašymus, klaidas, nusiskundimus ir "
+"t.t.\n"
+"Ji valdo pagrindines užduotis, tokias kaip bendravimo, identifikavimo,\n"
+"paskyrimo, sprendimo ir pranešimo.\n"
+"\n"
+"Open ERP užtikrina, kad visais atvejais yra sėkmingai susieti naudotojai, "
+"klientai ir\n"
+"tiekėjai. Jis gali automatiškai siųsti priminimus, pateikti užklausas, "
+"iššaukti\n"
+"specialius metodus ir daug kitų veiksmų, pagal Jūsų įmonės taisykles.\n"
+"\n"
+"Geriausia šios sistemos savybė, kad naudotojams nereikia daryti nieko\n"
+"ypatingo. Jie gali tiesiog siųskite laišką su prašymu. Open ERP \n"
+"padėkos už Jūsų pranešimą, automatiškai nusiųs jį\n"
+"atsakingiems asmenims ir užtikrins, kad ateityje analogiški pranešimai "
+"pasieks tinkamą\n"
+"vietą.\n"
+"\n"
+"CRM modulis turi el. pašto vartus ir sąsają tarp pašto ir Open ERP."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -1258,7 +1249,7 @@ msgstr ""
 #: field:crm.case.log,som:0
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
-msgstr "Nusiteikimas"
+msgstr "Kliento reakcinė nuotaika"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1276,7 +1267,7 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Compute Segmentation"
-msgstr "Apskaičiuoti segmentaciją"
+msgstr "Apskaičiuoti segmentą"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1289,7 +1280,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 #: model:ir.ui.menu,name:crm.next_id_53
 msgid "Segmentations"
-msgstr "Segmentacijos"
+msgstr "Segmentacija"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -1310,14 +1301,8 @@ msgstr "%(partner_email)s = Partnerio el. paštas"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
 msgid "Reset to Draft"
-msgstr "Grąžinti į juodraštį"
+msgstr "Atstatyti į juodraštį"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
@@ -1336,7 +1321,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.act_res_partner_canal_2_crm_case_opened
 #: model:ir.actions.act_window,name:crm.act_res_users_2_crm_case_opened
 msgid "Open cases"
-msgstr "Atviri klausimai"
+msgstr "Atviri įvykiai"
 
 #. module: crm
 #: field:crm.case,stage_id:0
@@ -1405,13 +1390,13 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr "Apdorotas maks. partnerio ID"
+msgstr "Maksimalus galimas partnerio ID"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "You can not delete this case. You should better cancel it."
-msgstr "Negalite ištrinti šio klausimo. Geriau jį atšaukite."
+msgstr "Jūs negalite ištrinti šio įvykio. Jūs geriau atšaukite jį."
 
 #. module: crm
 #: wizard_button:caldav.crm.subscribe,init,open:0
@@ -1421,7 +1406,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,trg_priority_from:0
 msgid "Minimum Priority"
-msgstr "Minimalus prioritetas"
+msgstr "Mažiausias svarbumas"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_generic_wizard_act
@@ -1452,7 +1437,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "done"
-msgstr "atlikta"
+msgstr "užbaigtas"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1466,17 +1451,19 @@ msgid ""
 "Check if you want to use this tab as part of the segmentation rule. If not "
 "checked, the criteria beneath will be ignored"
 msgstr ""
+"Pažymėkite, jeigu norite naudoti šią kortelę kaip dalį segmentavimo "
+"taisyklės. Jeigu nepažymėta, žemiau esantys kriterijai bus nepaisomi."
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "open"
-msgstr "atidaryti"
+msgstr "atvertas"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_attach:0
 msgid "Remind with attachment"
-msgstr "Priminti su priedu"
+msgstr "Priminti su prisegamais dokumentais"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead6
@@ -1487,12 +1474,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_remind_user:0
 msgid "Remind responsible"
-msgstr "Priminti atsakingam"
+msgstr "Priminti atsakingam darbuotojui"
 
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
-msgstr "Atlikimo būklė"
+msgstr "Vykdymo būsena"
 
 #. module: crm
 #: help:crm.menu.config_wizard,jobs:0
@@ -1510,7 +1497,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "draft"
-msgstr "juodraštis"
+msgstr "sukurtas"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim5
@@ -1522,8 +1509,6 @@ msgstr ""
 #: field:crm.case,date:0
 #: field:crm.case.log,date:0
 #: selection:crm.case.rule,trg_date_type:0
-#: view:crm.claim:0
-#: view:crm.phonecall:0
 msgid "Date"
 msgstr "Data"
 
@@ -1570,11 +1555,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "History"
 msgstr "Istorija"
 
@@ -1605,53 +1585,31 @@ msgstr ""
 #. module: crm
 #: view:crm.case:0
 msgid "Send Reminder"
-msgstr "Siųsti priminimą"
+msgstr "Išsiųsti priminimą"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "References"
 msgstr "Nuorodos"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
-#: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
-#: view:crm.claim:0
-#: view:crm.claim.assign_wizard:0
-#: view:crm.fundraising:0
-#: view:crm.helpdesk.assign_wizard:0
-#: wizard_button:crm.job.meeting_set,init,end:0
-#: wizard_button:crm.job.partner_create,init,end:0
-#: wizard_button:crm.job.reschedule_phone_call,init,end:0
-#: view:crm.lead:0
-#: wizard_button:crm.lead.opportunity_set,create_partner,end:0
-#: wizard_button:crm.lead.opportunity_set,opportunity,end:0
-#: wizard_button:crm.lead.partner_create,init,end:0
-#: view:crm.meeting.generic_wizard:0
-#: wizard_button:crm.new.send.mail,init,end:0
-#: view:crm.opportunity:0
-#: view:crm.opportunity.assign_wizard:0
-#: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
-#: view:crm.phonecall:0
-#: view:crm.phonecall.assign_wizard:0
-#: wizard_button:crm.phonecall.meeting_set,init,end:0
-#: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
-#: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
-#: wizard_button:crm.phonecall.partner_create,init,end:0
-#: wizard_button:crm.send.mail,init,end:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
+#: wizard_button:crm.case.section.menu,design_menu,end:0
+#: wizard_button:crm.case.section.menu,init,end:0
 #, python-format
 msgid "Cancel"
-msgstr "Atšaukti"
+msgstr "Atšaukta"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "Jūsų kompanijos adrese nerastas el. pašto ID!"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -1671,7 +1629,7 @@ msgstr ""
 #. module: crm
 #: view:res.partner.events:0
 msgid "General Description"
-msgstr "Bendras aprašymas"
+msgstr "Bendrasis aprašymas"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1712,7 +1670,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_priority:0
 msgid "Set priority to"
-msgstr "Nustatyti svarbą į"
+msgstr "Nustatyti svarbumą"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor2
@@ -1727,7 +1685,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_mail_body:0
 msgid "Mail body"
-msgstr "Laiško turinys"
+msgstr "El. laiško tekstas"
 
 #. module: crm
 #: help:crm.menu.config_wizard,meeting:0
@@ -1737,7 +1695,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr "Pardavimo suma"
+msgstr "Pardavimų suma"
 
 #. module: crm
 #: view:crm.case:0
@@ -1755,12 +1713,9 @@ msgid "="
 msgstr "="
 
 #. module: crm
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
-msgstr "Vardas"
+msgstr "Pavadinimas"
 
 #. module: crm
 #: view:crm.opportunity:0
@@ -1794,7 +1749,7 @@ msgstr ""
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr "Leidžia ištrinti nejuodraštinius klausimus"
+msgstr "Leidžia ištrinti ne juodraštinius įvykius"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor7
@@ -1809,11 +1764,6 @@ msgstr ""
 #. module: crm
 #: view:crm.case:0
 #: view:crm.case.rule:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Actions"
 msgstr "Veiksmai"
 
@@ -1823,7 +1773,7 @@ msgstr "Veiksmai"
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "High"
-msgstr "Aukštas"
+msgstr "Didelis"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
@@ -1848,7 +1798,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Delay After Trigger Date:"
-msgstr "Delsa po starto datos:"
+msgstr "Atidėti po įvykio datos:"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead5
@@ -1863,7 +1813,7 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "State of Mind Computation"
-msgstr "Nusiteikimo įvertinimas"
+msgstr "Nuotaikos įvertinimas"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
@@ -1932,7 +1882,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm
 msgid "CRM & SRM"
-msgstr "CRM & SRM"
+msgstr "CRM ir SRM"
 
 #. module: crm
 #: help:crm.menu.config_wizard,document_ics:0
@@ -1960,7 +1910,7 @@ msgstr "Priminti partneriui"
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Highest"
-msgstr "Aukščiausias"
+msgstr "Didžiausias"
 
 #. module: crm
 #: view:crm.job:0
@@ -1985,7 +1935,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr "Atsakyti-Kam"
+msgstr "Atsakyti (kam)"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ
@@ -2011,7 +1961,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,trg_priority_to:0
 msgid "Maximim Priority"
-msgstr "Maks. prioritetas"
+msgstr "Didžiausias svarbumas"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
@@ -2070,23 +2020,18 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,trg_state_from:0
 msgid "Case State"
-msgstr "Klausimo būklė"
+msgstr "Įvykio būsena"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Send"
 msgstr "Siųsti"
 
 #. module: crm
 #: field:crm.case,priority:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Priority"
-msgstr "Prioritetas"
+msgstr "Svarbumas"
 
 #. module: crm
 #: view:crm.opportunity:0
@@ -2121,7 +2066,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.section:0
 msgid "Case section"
-msgstr "Klausimo sekcija"
+msgstr "Įvykio sekcija"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
@@ -2130,11 +2075,6 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/crm_claim.py:0
-#: code:addons/crm/crm_helpdesk.py:0
-#: code:addons/crm/crm_meeting.py:0
-#: code:addons/crm/crm_opportunity.py:0
-#: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
 msgstr "Klaida!"
@@ -2142,7 +2082,7 @@ msgstr "Klaida!"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Fields to Change"
-msgstr "Laukai keitimui"
+msgstr "Laukų nustatymas"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead1
@@ -2152,12 +2092,12 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
 msgid "Cases Histories"
-msgstr "Klausimų istorijos"
+msgstr "Įvykių istorija"
 
 #. module: crm
 #: field:crm.case,create_date:0
 msgid "Created"
-msgstr "Sukurta"
+msgstr "Sukurtas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2167,7 +2107,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
 msgid "Segmentation line"
-msgstr "Segmentacijos eilutė"
+msgstr "Segmentavimo eilutė"
 
 #. module: crm
 #: wizard_field:crm.job.reschedule_phone_call,init,deadline:0
@@ -2244,7 +2184,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_date)s = Creation date"
-msgstr ""
+msgstr "%(case_date)s = Sukūrimo data"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone3
@@ -2255,7 +2195,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_mail_to_user:0
 msgid "Mail to responsible"
-msgstr "Rašyti atsakingam"
+msgstr "Siųsti atsakingam asmeniui"
 
 #. module: crm
 #: view:crm.job:0
@@ -2280,7 +2220,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Template of Email to Send"
-msgstr "Pašto šablonas siuntimui"
+msgstr "El. pašto šablonas"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,month:0
@@ -2332,7 +2272,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.history,log_id:0
 msgid "Log"
-msgstr "Log'ai"
+msgstr "Įvykių istorija"
 
 #. module: crm
 #: help:crm.menu.config_wizard,fund:0
@@ -2358,7 +2298,7 @@ msgstr "Stebėtojų el. paštai"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Note"
-msgstr "Pastaba"
+msgstr "Užrašai"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,delay_close:0
@@ -2374,20 +2314,12 @@ msgstr ""
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Low"
-msgstr "Žemas"
+msgstr "Mažas"
 
 #. module: crm
 #: field:crm.case,date_closed:0
-#: selection:crm.case,state:0
-#: selection:crm.case.rule,act_state:0
-#: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 msgid "Closed"
-msgstr "Uždaryta"
+msgstr "Užbaigtas"
 
 #. module: crm
 #: view:crm.job:0
@@ -2398,7 +2330,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "cancel"
-msgstr "atšaukti"
+msgstr "atšauktas"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2485,7 +2417,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.history:0
 msgid "Case History"
-msgstr "Klausimo istorija"
+msgstr "Įvykių istorija"
 
 #. module: crm
 #: field:crm.case,partner_phone:0
@@ -2502,7 +2434,7 @@ msgstr ""
 #: field:crm.case.rule,active:0
 #: field:crm.case.section,active:0
 msgid "Active"
-msgstr "Aktyvuota"
+msgstr "Aktyvus"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_attach:0
@@ -2510,11 +2442,13 @@ msgid ""
 "Check this if you want that all documents attached to the case be attached "
 "to the reminder email sent."
 msgstr ""
+"Pažymėkite, jei jūs norite, kad visi prie įvykio prisegti dokumentai, būtų "
+"prisegti prie priminimo el. laiško."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr "Privalomoji išraiška"
+msgstr "Privaloma išraiška"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -2565,8 +2499,7 @@ msgid "Are you sure you want to create a partner based on this job request ?"
 msgstr ""
 
 #. module: crm
-#: wizard_field:crm.lead.opportunity_set,create_partner,action:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
+#: field:crm.case.log,name:0
 msgid "Action"
 msgstr "Veiksmas"
 
@@ -2584,7 +2517,7 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
 msgid "Decrease (0>1)"
-msgstr "Mažėjimas (0>1)"
+msgstr "Sumažėjimas (0>1)"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_case_history_event
@@ -2605,7 +2538,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_user_email)s = Responsible email"
-msgstr "%(case_user_email)s = Atsakingo paštas"
+msgstr "%(case_user_email)s = Atsakingo asmens el. paštas"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_presale
@@ -2614,9 +2547,8 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.phonecall:0
 msgid "General"
-msgstr "Bendra"
+msgstr "Bendras"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
@@ -2647,7 +2579,7 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
-msgstr "Maks. intervalas"
+msgstr "Maksimalus intervalas"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
@@ -2661,19 +2593,9 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Open"
-msgstr "Atidaryta"
+msgstr "Atverta"
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -2706,16 +2628,6 @@ msgstr ""
 #. module: crm
 #: field:crm.case,user_id:0
 #: field:crm.case.rule,trg_user_id:0
-#: view:crm.claim:0
-#: field:crm.claim.assign_wizard,user_id:0
-#: view:crm.fundraising:0
-#: field:crm.helpdesk.assign_wizard,user_id:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: field:crm.meeting.generic_wizard,user_id:0
-#: view:crm.opportunity:0
-#: field:crm.opportunity.assign_wizard,user_id:0
-#: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
 msgstr "Atsakingas"
 
@@ -2748,8 +2660,8 @@ msgid ""
 "You can not escalate this case.\n"
 "You are already at the top level."
 msgstr ""
-"Nebegalima plėtoti šio klausimo.\n"
-"Jis jau aukščiausiame lygyje."
+"Jūs negalite plėtoti šio įvykio.\n"
+"Jūs esate jau aukščiausiame lygmenyje."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2764,7 +2676,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr "Maximali komunikavimo istorija"
+msgstr "Maksimali komunikavimo istorija"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2838,6 +2750,8 @@ msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
 msgstr ""
+"Skaičiavimas atliekamas su visais įvykiais, kurie įvyko per šį intervalą, "
+"praėjus X periodų."
 
 #. module: crm
 #: field:crm.case,case_id:0
@@ -2857,7 +2771,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.log,user_id:0
 msgid "User Responsible"
-msgstr "Atsakingas naudotojas"
+msgstr "Atsakingas darbuotojas"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
@@ -2873,7 +2787,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,email_last:0
 msgid "Latest E-Mail"
-msgstr "Naujausi laiškai"
+msgstr "Vėliausiasis el. paštas"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2893,7 +2807,7 @@ msgstr "ID"
 #. module: crm
 #: field:crm.case,log_ids:0
 msgid "Logs History"
-msgstr "Log'ų istorija"
+msgstr "Įvykių istorija"
 
 #. module: crm
 #: wizard_field:crm.lead.opportunity_set,opportunity,name:0
@@ -2914,7 +2828,7 @@ msgstr "Tęsti procesą"
 #. module: crm
 #: view:crm.case.history:0
 msgid "Case Description"
-msgstr "Klausimo aprašymas"
+msgstr "Įvykio aprašymas"
 
 #. module: crm
 #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
@@ -2948,9 +2862,11 @@ msgid "Jobs Hiring Process"
 msgstr ""
 
 #. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_52
 msgid "All Cases"
-msgstr "Visi klausimai"
+msgstr "Visi įvykiai"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
@@ -3016,12 +2932,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr "Einamasis"
+msgstr "Vykdomas"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_user)s = Responsible name"
-msgstr "%(case_user)s = Atsakingo vardas"
+msgstr "%(case_user)s = Atsakingas asmuo"
 
 #. module: crm
 #: wizard_field:crm.job.reschedule_phone_call,init,note:0
@@ -3067,7 +2983,6 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Error!"
 msgstr "Klaida!"
@@ -3135,12 +3050,12 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
 msgid "Operator"
-msgstr "Operatorius"
+msgstr "Valdiklis"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_log
 msgid "Case Communication History"
-msgstr "Klausimų komunikacijos istorija"
+msgstr "Įvykio komunikavimo istorija"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ
@@ -3150,30 +3065,19 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_subject)s = Case subject"
-msgstr "%(case_subject)s = Klausimo tema"
+msgstr "%(case_subject)s = Įvykio tema"
 
 #. module: crm
 #: field:crm.case,section_id:0
 #: field:crm.case.log,section_id:0
 #: field:crm.case.rule,trg_section_id:0
-#: field:crm.claim.assign_wizard,section_id:0
-#: field:crm.helpdesk.assign_wizard,section_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,section_id:0
-#: field:crm.meeting.generic_wizard,section_id:0
-#: field:crm.opportunity.assign_wizard,section_id:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,section_id:0
-#: field:crm.phonecall.assign_wizard,section_id:0
-#: field:report.crm.case.section.categ.categ2,section_id:0
-#: field:report.crm.case.section.categ.stage,section_id:0
-#: field:report.crm.case.section.categ2,section_id:0
-#: field:report.crm.case.section.stage,section_id:0
 msgid "Section"
 msgstr "Sekcija"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Optional Expression"
-msgstr "Būtina išraiška"
+msgstr "Pasirenkama išraiška"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund1
@@ -3197,10 +3101,7 @@ msgid "Your action"
 msgstr "Jūsų veiksmas"
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_lead3
 #: field:crm.case.history,email:0
-#: field:crm.email.add.cc,email:0
-#: view:crm.job:0
 msgid "Email"
 msgstr "El. paštas"
 
@@ -3208,7 +3109,7 @@ msgstr "El. paštas"
 #: field:crm.case,canal_id:0
 #: field:crm.case.log,canal_id:0
 msgid "Channel"
-msgstr "Kanalas"
+msgstr "Šaltinis"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_email:0
@@ -3223,7 +3124,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "E-Mail Reminders (includes the content of the case)"
-msgstr "El. pašto priminimai (įtraukia klausimo turinį)"
+msgstr "El. pašto priminimai (įtraukia įvykio turinį)"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_stage
@@ -3257,19 +3158,9 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0
-#: view:crm.opportunity:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Pending"
-msgstr "Laukia"
+msgstr "Laukiama"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
@@ -3351,7 +3242,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_user_id:0
 msgid "Set responsible to"
-msgstr "Nustatyti atsakingą į"
+msgstr "Nustatyti atsakingą asmenį"
 
 #. module: crm
 #: view:crm.job:0
@@ -3384,12 +3275,12 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Condition on Communication History"
-msgstr "Būklės ir komunikavimo istorija"
+msgstr "Komunikavimo istorijos sąlygos"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_partner:0
 msgid "Mail to partner"
-msgstr "Laiškas partneriui"
+msgstr "Išsiųsti el. paštą partneriui"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -3399,7 +3290,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_method:0
 msgid "Call Object Method"
-msgstr "Objekto iškvietimo metodas"
+msgstr "Susisiekimo metodas"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1
@@ -3407,9 +3298,23 @@ msgid "All Funds"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.section,calendar:0
-#: view:crm.meeting:0
-#: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
+#: selection:crm.case.section.menu,design_menu,menu10_option:0
+#: selection:crm.case.section.menu,design_menu,menu11_option:0
+#: selection:crm.case.section.menu,design_menu,menu12_option:0
+#: selection:crm.case.section.menu,design_menu,menu13_option:0
+#: selection:crm.case.section.menu,design_menu,menu14_option:0
+#: selection:crm.case.section.menu,design_menu,menu15_option:0
+#: selection:crm.case.section.menu,design_menu,menu16_option:0
+#: selection:crm.case.section.menu,design_menu,menu17_option:0
+#: selection:crm.case.section.menu,design_menu,menu1_option:0
+#: selection:crm.case.section.menu,design_menu,menu2_option:0
+#: selection:crm.case.section.menu,design_menu,menu3_option:0
+#: selection:crm.case.section.menu,design_menu,menu4_option:0
+#: selection:crm.case.section.menu,design_menu,menu5_option:0
+#: selection:crm.case.section.menu,design_menu,menu6_option:0
+#: selection:crm.case.section.menu,design_menu,menu7_option:0
+#: selection:crm.case.section.menu,design_menu,menu8_option:0
+#: selection:crm.case.section.menu,design_menu,menu9_option:0
 msgid "Calendar"
 msgstr "Kalendorius"
 
@@ -3431,7 +3336,7 @@ msgstr "Nuoroda 2"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Sales Purchase"
-msgstr ""
+msgstr "Pardavimai Pirkimai"
 
 #. module: crm
 #: view:crm.job:0
@@ -3455,6 +3360,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #, python-format
 msgid "Historize"
 msgstr "Archyvuoti"
@@ -3467,7 +3373,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr "Ne einamasis"
+msgstr "Nevykdomas"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,probability:0
@@ -3482,11 +3388,6 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.meeting:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Draft"
 msgstr "Juodraštis"
@@ -3494,7 +3395,7 @@ msgstr "Juodraštis"
 #. module: crm
 #: field:crm.case.rule,trg_date_range:0
 msgid "Delay after trigger date"
-msgstr "Delsa po starto datos"
+msgstr "Atidėti po datos"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3504,7 +3405,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_section_id:0
 msgid "Set section to"
-msgstr "Nustatyti sekciją į"
+msgstr "Nustatyti sekciją"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -3512,15 +3413,13 @@ msgstr "Nustatyti sekciją į"
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Normal"
-msgstr "Normalus"
+msgstr "Vidutinis"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
-msgstr "You must put a Partner eMail to use this action!"
+msgstr "Jūs turite nurodyti partnerio el. paštą norint naudoti šį veiksmą!"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -3574,7 +3473,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Section"
-msgstr "Pirminė sekcija"
+msgstr "Tėvinė sekcija"
 
 #. module: crm
 #: wizard_view:crm.job.reschedule_phone_call,init:0
@@ -3592,7 +3491,7 @@ msgstr ""
 #, python-format
 msgid ""
 "Can not send mail with empty body,you should have description in the body"
-msgstr ""
+msgstr "Negalima siųsti el. pašto be turinio"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3610,7 +3509,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Sections"
-msgstr "Šalutinės sesijos"
+msgstr "Vaikinės sekcijos"
 
 #. module: crm
 #: view:crm.case:0
@@ -3639,7 +3538,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,partner_address_id:0
 msgid "Partner Contact"
-msgstr "Partnerio kontaktas"
+msgstr "Partnerio adresas"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet1
@@ -3658,8 +3557,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.opportunity:0
 msgid "Estimates"
 msgstr "Įverčiai"
 
@@ -3671,9 +3568,13 @@ msgstr "Atsakingas naudotojas"
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
 #, python-format
 msgid "Close"
-msgstr "Uždaryta"
+msgstr "Užverta"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_helpdesk_assign_wizard
@@ -3683,7 +3584,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Case Partner"
-msgstr ""
+msgstr "Partnerio sąlygos"
 
 #. module: crm
 #: field:crm.case.section,code:0
@@ -3728,14 +3629,9 @@ msgid "% = The '%' Character"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,name:0
 #: field:crm.case.history,description:0
 #: field:crm.case.history,note:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
 #: field:crm.segmentation,description:0
 msgid "Description"
 msgstr "Aprašymas"
@@ -3758,6 +3654,8 @@ msgstr ""
 msgid ""
 "Check this if you want the rule to send a reminder by email to the user."
 msgstr ""
+"Pažymėkite, jei jūs norite, kad taisyklė nusiųstu priminimą elektroniniu "
+"paštu naudotojui."
 
 #. module: crm
 #: view:crm.case:0
@@ -3784,19 +3682,11 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: field:crm.case.log,case_id:0
-#: field:crm.claim,inherit_case_id:0
-#: field:crm.fundraising,inherit_case_id:0
-#: field:crm.helpdesk,inherit_case_id:0
-#: field:crm.job,inherit_case_id:0
-#: field:crm.lead,inherit_case_id:0
-#: field:crm.meeting,inherit_case_id:0
-#: field:crm.opportunity,inherit_case_id:0
-#: field:crm.phonecall,inherit_case_id:0
 #: model:ir.model,name:crm.model_crm_case
 #: model:res.request.link,name:crm.req_link_case
 #, python-format
 msgid "Case"
-msgstr "Klausimas"
+msgstr "Įvykis"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -3804,7 +3694,7 @@ msgstr "Klausimas"
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Lowest"
-msgstr "Žemiausias"
+msgstr "Mažiausias"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3824,7 +3714,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Priority Range"
-msgstr ""
+msgstr "Svarbumo sąlygos"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -3832,6 +3722,8 @@ msgid ""
 "If the partner has not purchased (or buied) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
 msgstr ""
+"Jeigu partneris nepirko (nepardavė) per periodą, nuotaika sumažinama pagal "
+"šį rodiklį. Mažinant atliekama daugyba."
 
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
@@ -3893,12 +3785,12 @@ msgstr ""
 #. module: crm
 #: view:crm.case.log:0
 msgid "Case logs"
-msgstr "Klausimų log'ai"
+msgstr "Įvykių žurnalas"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Timing"
-msgstr ""
+msgstr "Laiko sąlygos"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_helpdesk
@@ -3913,7 +3805,6 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,sequence:0
 #: field:crm.case.section,sequence:0
-#: field:crm.case.stage,sequence:0
 msgid "Sequence"
 msgstr "Seka"
 
@@ -3931,13 +3822,13 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr "Kontroliuoti kintamąjį"
+msgstr "Kontrolinis kintamasis"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act_tree
 msgid "Cases by section"
-msgstr "Klausimai pagal sekciją"
+msgstr "Įvykiai pagal sekciją"
 
 #. module: crm
 #: view:crm.job:0
@@ -3954,8 +3845,147 @@ msgstr ""
 msgid "Newsletter"
 msgstr ""
 
+#~ msgid "Add Last Mail for Replying"
+#~ msgstr "Pridėti atsakymui paskutinį laišką"
+
+#~ msgid "Extra Info"
+#~ msgstr "Papildoma informacija"
+
+#~ msgid "All Draft "
+#~ msgstr "Visi juodraščiai "
+
+#~ msgid "My Draft "
+#~ msgstr "Mano juodraščiai "
+
+#~ msgid "crm.case.section.open"
+#~ msgstr "crm.case.section.open"
+
+#~ msgid "New Form"
+#~ msgstr "Nauja forma"
+
+#~ msgid "Tree View"
+#~ msgstr "Medžio rodinys"
+
 #~ msgid "My "
 #~ msgstr "Mano "
 
 #~ msgid "New "
 #~ msgstr "Naujas "
+
+#~ msgid "All Late "
+#~ msgstr "Visi vėluojantys "
+
+#~ msgid "My Late "
+#~ msgstr "Mano vėluojantys "
+
+#~ msgid "My Pending "
+#~ msgstr "Mano laukiantys "
+
+#~ msgid "New With Calendar"
+#~ msgstr "Naujas su kalendoriumi"
+
+#~ msgid "List With Calendar"
+#~ msgstr "Sąrašas su kalendoriumi"
+
+#~ msgid "All Unassigned "
+#~ msgstr "Visi nepriskirti "
+
+#~ msgid "Don't Create"
+#~ msgstr "Nesukurti"
+
+#~ msgid "Created Menus"
+#~ msgstr "Sukurti meniu"
+
+#~ msgid "All Canceled "
+#~ msgstr "Visi atšaukti "
+
+#~ msgid "All "
+#~ msgstr "Visi "
+
+#~ msgid "List"
+#~ msgstr "Sąrašas"
+
+#~ msgid "Update The Proposed Menus To Be Created"
+#~ msgstr "Pasirinkite meniu, kuriuos norite sukurti"
+
+#~ msgid "Base Information"
+#~ msgstr "Pagrindinė informacija"
+
+#~ msgid "All Open "
+#~ msgstr "Visi atviri "
+
+#~ msgid "Create menus for a case section"
+#~ msgstr "Sukurti įvykio sekcijos meniu"
+
+#~ msgid "Create menu Entries"
+#~ msgstr "Sukurti meniu įrašams"
+
+#~ msgid "All Unclosed and Unassigned "
+#~ msgstr "Visi neužverti ir nepriskirti "
+
+#~ msgid "My Open "
+#~ msgstr "Mano atviri "
+
+#~ msgid "Select Views (empty for default)"
+#~ msgstr "Pasirinkite rodinius (tuščias pagal nutylėjimą)"
+
+#~ msgid "Mail to watchers (Cc)"
+#~ msgstr "Išsiųsti stebėtojams (Cc)"
+
+#~ msgid "My cases"
+#~ msgstr "Mano įvykiai"
+
+#~ msgid "My Open Cases"
+#~ msgstr "Mano atviri įvykiai"
+
+#~ msgid "My Unclosed "
+#~ msgstr "Mano neužverti "
+
+#~ msgid ""
+#~ "These people will receive a copy of the futur communication between partner "
+#~ "and users by email"
+#~ msgstr ""
+#~ "Šie žmonės gaus el. laiško kopiją būsimos komunikacijos tarp partnerio ir "
+#~ "naudotojų"
+
+#~ msgid "Calendar View"
+#~ msgstr "Kalendoriaus rodinys"
+
+#~ msgid "Parent Menu"
+#~ msgstr "Tėvinis meniu"
+
+#~ msgid "Base Menu Name"
+#~ msgstr "Pagrindinio meniu pavadinimas"
+
+#~ msgid "All Unclosed "
+#~ msgstr "Visi neužverti "
+
+#~ msgid "Complete this if you use the mail gateway."
+#~ msgstr "Užpildykite, jeigu naudosite el. paštą"
+
+#~ msgid "Create Menus For Cases"
+#~ msgstr "Sukurti meniu įvykiams"
+
+#~ msgid "All Pending "
+#~ msgstr "Visi laukiantys "
+
+#~ msgid "Send Partner & Historize"
+#~ msgstr "Išsiųsti partneriui ir archyvuoti"
+
+#~ msgid "All Histories"
+#~ msgstr "Visų įvykių istorija"
+
+#~ msgid "My Canceled "
+#~ msgstr "Mano atšaukti "
+
+#~ msgid "Form View"
+#~ msgstr "Formos rodinys"
+
+#~ msgid "this wizard will create all sub-menus, within the selected menu."
+#~ msgstr "Šis vedlys sukurs visus vaikinius meniu, pažymėto meniu viduje."
+
+#~ msgid ""
+#~ "You may want to create a new parent menu to put all the created menus in."
+#~ msgstr ""
+#~ "Jūs galite norėti sukurti naują tėvinį meniu, kad įdėtumėte visus sukurtus "
+#~ "meniu."
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 1337d0eefa8..9965d059c1c 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 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-05-22 04:53+0000\n"
-"Last-Translator: Guilherme Santos <Unknown>\n"
+"PO-Revision-Date: 2010-07-28 13:44+0000\n"
+"Last-Translator: Leandro Chaves <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-06-22 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -27,6 +27,8 @@ msgid ""
 "This property defines the list                 of date/time exceptions for "
 "arecurring calendar component."
 msgstr ""
+"Esta propriedade define a lista de exceção de data/hora para componente do "
+"calendário recorrente."
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_user:0
@@ -44,12 +46,12 @@ msgstr "Título"
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr ""
+msgstr "Casos por seção e categoria2"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
 msgid "Close Lead"
-msgstr ""
+msgstr "Encerrar ligação"
 
 #. module: crm
 #: view:crm.job:0
@@ -62,7 +64,7 @@ msgstr "    7 Dias    "
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Administrar um serviço de helpdesk"
 
 #. module: crm
 #: view:crm.job:0
@@ -82,19 +84,17 @@ msgstr "Custos planejados"
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Fechar requisição de trabalho"
 
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Nome do estágio"
 
 #. module: crm
 #: view:crm.case:0
 #: view:crm.case.history:0
-#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
 #: model:ir.actions.act_window,name:crm.crm_case_section_open_act
-#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_51
 msgid "Cases"
 msgstr "Casos"
@@ -116,7 +116,7 @@ msgstr "Recursos Humanos"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
 msgid "Cases by Opportunities, Category and Type"
-msgstr ""
+msgstr "Casos por Oportunidades, Categoria e Tipo"
 
 #. module: crm
 #: help:crm.menu.config_wizard,claims:0
@@ -124,6 +124,8 @@ msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Administra as reivindicações  de fornecedores e clientes, incluindo suas "
+"ações corretivas ou preventivas."
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -133,19 +135,16 @@ msgstr "Quantia"
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Reunião normal ou por telefone para a oportunidade"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim2
 #: model:crm.case.stage,name:crm.stage_meet1
 msgid "Fixed"
-msgstr ""
+msgstr "Fixo"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/crm_job_wizard.py:0
-#: code:addons/crm/wizard/crm_lead_wizard.py:0
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
 msgstr "Atenção !"
@@ -154,7 +153,7 @@ msgstr "Atenção !"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Please specify user's email address !"
-msgstr ""
+msgstr "Por favor, especifique o endereço de e-mail do usuário !"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -196,32 +195,20 @@ msgid ""
 "Section to which Case belongs to. Define Responsible user and Email account "
 "for mail gateway."
 msgstr ""
+"Seção a que pertence o caso. Definir usuário responsável e conta de e-mail "
+"para o acesso."
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,partner_id:0
-#: model:crm.case.categ,name:crm.categ_lead4
-#: model:crm.case.categ,name:crm.categ_oppor4
-#: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
 #: field:crm.case.rule,trg_partner_id:0
-#: selection:crm.email.add.cc,name:0
-#: field:crm.email.add.cc,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
-#: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
 msgstr "Parceiro"
 
 #. module: crm
 #: field:crm.case.categ,section_id:0
-#: field:crm.case.category2,section_id:0
 #: view:crm.case.section:0
 #: field:crm.case.section,name:0
-#: field:crm.case.stage,section_id:0
+#: wizard_field:crm.case.section.menu,init,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
 msgstr "Seção de caso"
@@ -275,7 +262,8 @@ msgid "Send New Email"
 msgstr "Enviar Novo Email"
 
 #. module: crm
-#: view:crm.case.history:0
+#: model:ir.actions.act_window,name:crm.crm_case_history_my-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_history_my-act
 msgid "My Histories"
 msgstr "Meus históricos"
 
@@ -294,11 +282,12 @@ msgstr "Sessões"
 #: help:crm.menu.config_wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
 msgstr ""
+"As trilhas identificaram oportunidades de negócio para melhoria das vendas."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Dates"
-msgstr ""
+msgstr "Datas excepcionais"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -334,11 +323,6 @@ msgstr "Atenção!"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Dates"
 msgstr "Datas"
 
@@ -350,7 +334,7 @@ msgstr "Teste de segmentação"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "Perspectiva do Parceiro"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -382,7 +366,7 @@ msgstr "Tipo de atraso"
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "Contato"
 
 #. module: crm
 #: view:crm.job:0
@@ -421,7 +405,6 @@ msgid "Exception Rules"
 msgstr "Regras de exceção"
 
 #. module: crm
-#: field:crm.menu.config_wizard,opportunity:0
 #: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
 msgid "Business Opportunities"
 msgstr "Oportunidades de negócios"
@@ -453,7 +436,7 @@ msgstr "%(email_from)s = Email do Parceiro"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 msgid "Dead"
-msgstr ""
+msgstr "Morta"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -469,17 +452,11 @@ msgstr "Cliente existente"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
 msgid "Home"
-msgstr ""
+msgstr "Início"
 
 #. module: crm
 #: field:crm.case,categ_id:0
 #: field:crm.case.rule,trg_categ_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
-#: view:crm.opportunity:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
-#: field:report.crm.case.section.categ.categ2,categ_id:0
-#: field:report.crm.case.section.categ.stage,categ_id:0
-#: field:report.crm.case.section.stage,categ_id:0
 msgid "Category"
 msgstr "Categoria"
 
@@ -509,11 +486,6 @@ msgstr "%(parceiro)s = Nome do Parceiro"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Action Information"
 msgstr "Informação da ação"
 
@@ -542,13 +514,12 @@ msgstr "Condições"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act_open
 msgid "Open Cases"
 msgstr "Casos abertos"
 
 #. module: crm
-#: field:crm.case.log,name:0
-#: view:crm.claim:0
-#: view:crm.job:0
+#: field:crm.case,state:0
 msgid "Status"
 msgstr "Situação"
 
@@ -560,7 +531,7 @@ msgstr "Situação"
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Criar oportunidade"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -580,9 +551,6 @@ msgstr "Árvore de reuniões"
 #: view:crm.case:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
 msgstr "Escalada"
@@ -601,7 +569,7 @@ msgstr "Gestão do Relacionamento entre Cliente & Fornecedor"
 #: view:crm.email.add.cc:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
 msgid "Add CC"
-msgstr ""
+msgstr "Adicionar CC"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -652,7 +620,7 @@ msgstr "%(case_id)s = Identificação do Caso"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
 msgid "New Business"
-msgstr ""
+msgstr "Negócio novo"
 
 #. module: crm
 #: help:crm.case,email_from:0
@@ -696,12 +664,10 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Política de Reclamações"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
@@ -727,7 +693,7 @@ msgstr "Contrato proposto"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
 msgid "Jobs - Hiring Process"
-msgstr ""
+msgstr "Trabalhos - Processo de contratação"
 
 #. module: crm
 #: view:crm.case:0
@@ -747,11 +713,6 @@ msgstr "Setembro"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Communication history"
 msgstr "Histórico"
 
@@ -794,7 +755,7 @@ msgstr "Linhas da segmentação de parceiro"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
 msgid "All Leads"
-msgstr ""
+msgstr "Todas as iniciativas (leads)"
 
 #. module: crm
 #: view:crm.lead:0
@@ -868,7 +829,7 @@ msgstr "Oportunidade"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Emails"
-msgstr ""
+msgstr "E-mails"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
@@ -883,18 +844,18 @@ msgstr "Parar processo"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "Reclamações Efetivas"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "Chamadas telefônicas de pesquisa"
 
 #. module: crm
 #: wizard_button:crm.lead.opportunity_set,create_partner,create:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
 msgid "Continue"
-msgstr ""
+msgstr "Continuar"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -1174,10 +1135,8 @@ msgid "Next Action"
 msgstr "Próxima ação"
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,date_deadline:0
 #: selection:crm.case.rule,trg_date_type:0
-#: view:crm.opportunity:0
 msgid "Deadline"
 msgstr "Prazo final"
 
@@ -1196,7 +1155,7 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "Segmentação de Parceiros"
+msgstr "Segmentações de Parceiros"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1363,12 +1322,6 @@ msgstr "%(partner_email)s = Email do Parceiro"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
 msgid "Reset to Draft"
 msgstr "Restaurar para esboço"
 
@@ -1581,8 +1534,6 @@ msgstr "Aguardando resposta"
 #: field:crm.case,date:0
 #: field:crm.case.log,date:0
 #: selection:crm.case.rule,trg_date_type:0
-#: view:crm.claim:0
-#: view:crm.phonecall:0
 msgid "Date"
 msgstr "Data"
 
@@ -1629,11 +1580,6 @@ msgstr "Dá a localização da reunião"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "History"
 msgstr "Histórico"
 
@@ -1668,40 +1614,18 @@ msgstr "Enviar lembrete"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "References"
 msgstr "Referências"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
-#: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
-#: view:crm.claim:0
-#: view:crm.claim.assign_wizard:0
-#: view:crm.fundraising:0
-#: view:crm.helpdesk.assign_wizard:0
-#: wizard_button:crm.job.meeting_set,init,end:0
-#: wizard_button:crm.job.partner_create,init,end:0
-#: wizard_button:crm.job.reschedule_phone_call,init,end:0
-#: view:crm.lead:0
-#: wizard_button:crm.lead.opportunity_set,create_partner,end:0
-#: wizard_button:crm.lead.opportunity_set,opportunity,end:0
-#: wizard_button:crm.lead.partner_create,init,end:0
-#: view:crm.meeting.generic_wizard:0
-#: wizard_button:crm.new.send.mail,init,end:0
-#: view:crm.opportunity:0
-#: view:crm.opportunity.assign_wizard:0
-#: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
-#: view:crm.phonecall:0
-#: view:crm.phonecall.assign_wizard:0
-#: wizard_button:crm.phonecall.meeting_set,init,end:0
-#: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
-#: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
-#: wizard_button:crm.phonecall.partner_create,init,end:0
-#: wizard_button:crm.send.mail,init,end:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
+#: wizard_button:crm.case.section.menu,design_menu,end:0
+#: wizard_button:crm.case.section.menu,init,end:0
 #, python-format
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1814,9 +1738,6 @@ msgid "="
 msgstr "="
 
 #. module: crm
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
 msgstr "Nome"
@@ -1868,11 +1789,6 @@ msgstr ""
 #. module: crm
 #: view:crm.case:0
 #: view:crm.case.rule:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Actions"
 msgstr "Ações"
 
@@ -2133,17 +2049,12 @@ msgstr "Estado do caso"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Send"
 msgstr "Enviar"
 
 #. module: crm
 #: field:crm.case,priority:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -2189,11 +2100,6 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/crm_claim.py:0
-#: code:addons/crm/crm_helpdesk.py:0
-#: code:addons/crm/crm_meeting.py:0
-#: code:addons/crm/crm_opportunity.py:0
-#: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
 msgstr "Erro !"
@@ -2437,14 +2343,6 @@ msgstr "Baixo"
 
 #. module: crm
 #: field:crm.case,date_closed:0
-#: selection:crm.case,state:0
-#: selection:crm.case.rule,act_state:0
-#: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 msgid "Closed"
 msgstr "Fechado"
 
@@ -2626,10 +2524,9 @@ msgid "Are you sure you want to create a partner based on this job request ?"
 msgstr ""
 
 #. module: crm
-#: wizard_field:crm.lead.opportunity_set,create_partner,action:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
+#: field:crm.case.log,name:0
 msgid "Action"
-msgstr "Ação"
+msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
@@ -2675,7 +2572,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.phonecall:0
 msgid "General"
 msgstr "Geral"
 
@@ -2722,16 +2618,6 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Open"
 msgstr "Abrir"
@@ -2767,16 +2653,6 @@ msgstr ""
 #. module: crm
 #: field:crm.case,user_id:0
 #: field:crm.case.rule,trg_user_id:0
-#: view:crm.claim:0
-#: field:crm.claim.assign_wizard,user_id:0
-#: view:crm.fundraising:0
-#: field:crm.helpdesk.assign_wizard,user_id:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: field:crm.meeting.generic_wizard,user_id:0
-#: view:crm.opportunity:0
-#: field:crm.opportunity.assign_wizard,user_id:0
-#: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
 msgstr "Responsável"
 
@@ -3011,6 +2887,8 @@ msgid "Jobs Hiring Process"
 msgstr ""
 
 #. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_52
 msgid "All Cases"
 msgstr "Todos os casos"
@@ -3130,7 +3008,6 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -3219,17 +3096,6 @@ msgstr "%(case_subject)s = Assunto do Caso"
 #: field:crm.case,section_id:0
 #: field:crm.case.log,section_id:0
 #: field:crm.case.rule,trg_section_id:0
-#: field:crm.claim.assign_wizard,section_id:0
-#: field:crm.helpdesk.assign_wizard,section_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,section_id:0
-#: field:crm.meeting.generic_wizard,section_id:0
-#: field:crm.opportunity.assign_wizard,section_id:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,section_id:0
-#: field:crm.phonecall.assign_wizard,section_id:0
-#: field:report.crm.case.section.categ.categ2,section_id:0
-#: field:report.crm.case.section.categ.stage,section_id:0
-#: field:report.crm.case.section.categ2,section_id:0
-#: field:report.crm.case.section.stage,section_id:0
 msgid "Section"
 msgstr "Seção"
 
@@ -3260,10 +3126,7 @@ msgid "Your action"
 msgstr "Sua ação"
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_lead3
 #: field:crm.case.history,email:0
-#: field:crm.email.add.cc,email:0
-#: view:crm.job:0
 msgid "Email"
 msgstr "E-mail"
 
@@ -3320,16 +3183,6 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0
-#: view:crm.opportunity:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Pending"
 msgstr "Pendente"
@@ -3475,11 +3328,25 @@ msgid "All Funds"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.section,calendar:0
-#: view:crm.meeting:0
-#: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
+#: selection:crm.case.section.menu,design_menu,menu10_option:0
+#: selection:crm.case.section.menu,design_menu,menu11_option:0
+#: selection:crm.case.section.menu,design_menu,menu12_option:0
+#: selection:crm.case.section.menu,design_menu,menu13_option:0
+#: selection:crm.case.section.menu,design_menu,menu14_option:0
+#: selection:crm.case.section.menu,design_menu,menu15_option:0
+#: selection:crm.case.section.menu,design_menu,menu16_option:0
+#: selection:crm.case.section.menu,design_menu,menu17_option:0
+#: selection:crm.case.section.menu,design_menu,menu1_option:0
+#: selection:crm.case.section.menu,design_menu,menu2_option:0
+#: selection:crm.case.section.menu,design_menu,menu3_option:0
+#: selection:crm.case.section.menu,design_menu,menu4_option:0
+#: selection:crm.case.section.menu,design_menu,menu5_option:0
+#: selection:crm.case.section.menu,design_menu,menu6_option:0
+#: selection:crm.case.section.menu,design_menu,menu7_option:0
+#: selection:crm.case.section.menu,design_menu,menu8_option:0
+#: selection:crm.case.section.menu,design_menu,menu9_option:0
 msgid "Calendar"
-msgstr "Calendário"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job1
@@ -3523,6 +3390,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #, python-format
 msgid "Historize"
 msgstr "Historiar"
@@ -3550,11 +3418,6 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.meeting:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Draft"
 msgstr "Esboço"
@@ -3584,8 +3447,6 @@ msgstr "Normal"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
 msgstr "Você deve colocar um e-mail de parceiro para utilizar esta ação!"
@@ -3728,8 +3589,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.opportunity:0
 msgid "Estimates"
 msgstr "Estimativas"
 
@@ -3741,6 +3600,10 @@ msgstr "Usuário Responsável"
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
 #, python-format
 msgid "Close"
 msgstr "Fechar"
@@ -3798,14 +3661,9 @@ msgid "% = The '%' Character"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,name:0
 #: field:crm.case.history,description:0
 #: field:crm.case.history,note:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
 #: field:crm.segmentation,description:0
 msgid "Description"
 msgstr "Descrição"
@@ -3855,14 +3713,6 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: field:crm.case.log,case_id:0
-#: field:crm.claim,inherit_case_id:0
-#: field:crm.fundraising,inherit_case_id:0
-#: field:crm.helpdesk,inherit_case_id:0
-#: field:crm.job,inherit_case_id:0
-#: field:crm.lead,inherit_case_id:0
-#: field:crm.meeting,inherit_case_id:0
-#: field:crm.opportunity,inherit_case_id:0
-#: field:crm.phonecall,inherit_case_id:0
 #: model:ir.model,name:crm.model_crm_case
 #: model:res.request.link,name:crm.req_link_case
 #, python-format
@@ -3986,7 +3836,6 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,sequence:0
 #: field:crm.case.section,sequence:0
-#: field:crm.case.stage,sequence:0
 msgid "Sequence"
 msgstr "Sequência"
 
@@ -4166,8 +4015,21 @@ msgstr ""
 #~ msgid "Mail to watchers (Cc)"
 #~ msgstr "Correio para observadors (cc)"
 
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
+#~ msgid "New "
+#~ msgstr "Novo "
 
 #~ msgid "Form View"
 #~ msgstr "Visualização de formulário"
+
+#~ msgid ""
+#~ "You may want to create a new parent menu to put all the created menus in."
+#~ msgstr ""
+#~ "Pode ser que você queira criar um novo menu principal para agregar todos os "
+#~ "menus criados."
+
+#~ msgid "this wizard will create all sub-menus, within the selected menu."
+#~ msgstr "este wizard cria todos os sub-menus, dentro de um menu selecionado"
+
+#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
+#~ msgstr ""
+#~ "Data limite é calculada automaticamente pela soma da Data Inicial + Duração"
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index a7827c05dc8..f37bc538036 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-03-29 13:14+0000\n"
-"Last-Translator: darkblue <darkblue086@yahoo.com.cn>\n"
+"PO-Revision-Date: 2010-07-20 10: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-06-22 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -26,28 +26,28 @@ msgstr "发送到"
 msgid ""
 "This property defines the list                 of date/time exceptions for "
 "arecurring calendar component."
-msgstr ""
+msgstr "这属性定义了一个循环的日历组件的例外日期/ 时间列表"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_user:0
 msgid ""
 "Check this if you want the rule to send an email to the responsible person."
-msgstr ""
+msgstr "选这个, 如果你想规定发送Email给负责人"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Title"
-msgstr ""
+msgstr "标题"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr ""
+msgstr "划分的业务个案和分类2"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
 msgid "Close Lead"
-msgstr "关闭线索"
+msgstr "关闭营销线索"
 
 #. module: crm
 #: view:crm.job:0
@@ -60,17 +60,17 @@ msgstr "    7天    "
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr "管理求助台服务"
+msgstr "管理帮助平台服务"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Pending Jobs"
-msgstr ""
+msgstr "悬而未决的招聘"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
 msgid "Button Pressed"
-msgstr "紧迫"
+msgstr "按下的按钮"
 
 #. module: crm
 #: view:crm.case:0
@@ -80,7 +80,7 @@ msgstr "计划成本"
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "关闭工作请求"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -90,9 +90,7 @@ msgstr "阶段名称"
 #. module: crm
 #: view:crm.case:0
 #: view:crm.case.history:0
-#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
 #: model:ir.actions.act_window,name:crm.crm_case_section_open_act
-#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_51
 msgid "Cases"
 msgstr "业务个案"
@@ -102,7 +100,7 @@ msgstr "业务个案"
 msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
-msgstr "业务伙伴分类将加入到与业务伙伴匹配细分标准后处理"
+msgstr "这业务伙伴分类将加入到符合的业务伙伴细分准则"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_hr
@@ -112,19 +110,19 @@ msgstr "人力资源"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
 msgid "Cases by Opportunities, Category and Type"
-msgstr "按商机，分类和进程排列案例"
+msgstr "业务个案的商机, 分类和类型"
 
 #. module: crm
 #: help:crm.menu.config_wizard,claims:0
 msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
-msgstr "管理客户和供应商的索求，包括您的纠正或预防措施"
+msgstr "管理客户和供应商的索赔, 包括您的纠正或预防措施"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -139,9 +137,6 @@ msgstr "已解决"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/crm_job_wizard.py:0
-#: code:addons/crm/wizard/crm_lead_wizard.py:0
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
 msgstr "警告！"
@@ -150,12 +145,12 @@ msgstr "警告！"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Please specify user's email address !"
-msgstr "请指定用户的电子邮件地址"
+msgstr "请指定用户的Email地址"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Campaign"
-msgstr "商战"
+msgstr "营销活动"
 
 #. module: crm
 #: view:crm.opportunity:0
@@ -166,61 +161,47 @@ msgstr "搜索商机"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
 #: view:report.crm.case.section.stage:0
 msgid "Cases by Section and Stage"
-msgstr "按组和阶段排列案例"
+msgstr "划分的业务个案和阶段"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,duration:0
 #: wizard_field:crm.phonecall.meeting_set,init,duration:0
 msgid "Duration (Hours)"
-msgstr "期间(小时数)"
+msgstr "持续时间(小时数)"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
 msgid "TRANSPARENT"
-msgstr ""
+msgstr "清晰的"
 
 #. module: crm
 #: help:crm.case.rule,server_action_id:0
 msgid ""
 "Describes the action name.eg:on which object which ation to be taken on "
 "basis of which condition"
-msgstr ""
+msgstr "动作描述, 例如: 根据哪些条件哪些对象的哪些动作要起作用"
 
 #. module: crm
 #: help:crm.case,section_id:0
 msgid ""
 "Section to which Case belongs to. Define Responsible user and Email account "
 "for mail gateway."
-msgstr ""
+msgstr "属于哪个划分的业务个案. 定义责任用户和电子邮件帐号的邮件网关."
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,partner_id:0
-#: model:crm.case.categ,name:crm.categ_lead4
-#: model:crm.case.categ,name:crm.categ_oppor4
-#: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
 #: field:crm.case.rule,trg_partner_id:0
-#: selection:crm.email.add.cc,name:0
-#: field:crm.email.add.cc,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
-#: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: crm
 #: field:crm.case.categ,section_id:0
-#: field:crm.case.category2,section_id:0
 #: view:crm.case.section:0
 #: field:crm.case.section,name:0
-#: field:crm.case.stage,section_id:0
+#: wizard_field:crm.case.section.menu,init,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
-msgstr "业务个案项"
+msgstr "划分的业务个案"
 
 #. module: crm
 #: view:crm.job:0
@@ -230,7 +211,7 @@ msgstr "建议薪资"
 #. module: crm
 #: help:crm.case.section,sequence:0
 msgid "Gives the sequence order when displaying a list of case sections."
-msgstr ""
+msgstr "在显示划分的业务个案列表时提供序列顺序"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -243,7 +224,7 @@ msgstr "电话呼叫"
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
 msgid "Cases by section and stage"
-msgstr ""
+msgstr "划分的业务个案和阶段"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
@@ -268,33 +249,34 @@ msgstr "内容使用的特别关键字"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "发送新Email"
 
 #. module: crm
-#: view:crm.case.history:0
+#: model:ir.actions.act_window,name:crm.crm_case_history_my-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_history_my-act
 msgid "My Histories"
 msgstr "我的日志"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr "条件"
+msgstr "标准"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sections"
-msgstr "项"
+msgstr "划分的业务个案"
 
 #. module: crm
 #: help:crm.menu.config_wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr "为你的销售渠道跟踪已定义的商机"
+msgstr "从你的销售渠道跟踪出销售机会"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Dates"
-msgstr ""
+msgstr "例外日期"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -304,17 +286,17 @@ msgstr "最近动作日期"
 #. module: crm
 #: view:crm.job:0
 msgid "Appreciation"
-msgstr ""
+msgstr "鉴识"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
 msgid "Second Interview"
-msgstr "复试"
+msgstr "第二次面谈"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "预订一个遥远的日程"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -330,11 +312,6 @@ msgstr "警告!"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Dates"
 msgstr "日期"
 
@@ -346,7 +323,7 @@ msgstr "细分测试"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "潜在业务伙伴"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -363,12 +340,12 @@ msgstr "联系人姓名"
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Link to an existing partner"
-msgstr "链接到已存在的业务伙伴"
+msgstr "链接到现有的业务伙伴"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
 msgid "Delay type"
-msgstr "耽搁类型"
+msgstr "推延类型"
 
 #. module: crm
 #: view:crm.claim:0
@@ -378,22 +355,22 @@ msgstr "耽搁类型"
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "联系方式"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr "下次面试"
+msgstr "下次会面"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "业务个案日志的正则表达式"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_email_add_cc
 msgid "Email Add CC"
-msgstr ""
+msgstr "Email地址"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -406,15 +383,14 @@ msgid ""
 "The channels represent the different communication modes available with the "
 "customer. With each commercial opportunity, you can indicate the canall "
 "which is this opportunity source."
-msgstr ""
+msgstr "渠道代表与客户不同的沟通, 在每一个商机你能标记出哪个是这机会的来源."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Rules"
-msgstr ""
+msgstr "例外规则"
 
 #. module: crm
-#: field:crm.menu.config_wizard,opportunity:0
 #: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
 msgid "Business Opportunities"
 msgstr "商机"
@@ -422,14 +398,14 @@ msgstr "商机"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "接受作为索赔"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid ""
 "The rule use a AND operator. The case must match all non empty fields so "
 "that the rule execute the action described in the 'Actions' tab."
-msgstr "该规则使用AND操作符.这业务个案必须是非空字段,而且该规则的执行动作描述在动作标签."
+msgstr "该规则使用AND操作符. 这业务个案必须是非空字段而且该规则的执行动作描述在动作标签."
 
 #. module: crm
 #: field:crm.case,history_line:0
@@ -439,12 +415,12 @@ msgstr "沟通"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(email_from)s = Partner email"
-msgstr "%(email_from)s = 业务伙伴电子邮箱"
+msgstr "%(email_from)s = 业务伙伴的Email"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 msgid "Dead"
-msgstr ""
+msgstr "死寂的"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -465,12 +441,6 @@ msgstr ""
 #. module: crm
 #: field:crm.case,categ_id:0
 #: field:crm.case.rule,trg_categ_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
-#: view:crm.opportunity:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
-#: field:report.crm.case.section.categ.categ2,categ_id:0
-#: field:report.crm.case.section.categ.stage,categ_id:0
-#: field:report.crm.case.section.stage,categ_id:0
 msgid "Category"
 msgstr "分类"
 
@@ -479,19 +449,19 @@ msgstr "分类"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
 #: view:report.crm.case.section.categ.stage:0
 msgid "Cases by Section, Category and Stage"
-msgstr "按组，分类和阶段排列案例"
+msgstr "划分的业务个案, 分类和阶段"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_watchers:0
 msgid ""
 "Check this if you want the rule to mark CC(mail to any other person defined "
 "in actions)."
-msgstr ""
+msgstr "选这个, 如果你想这规则标记为cc(在行动定义中发邮件到任何人)"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr ""
+msgstr "隐私"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -500,11 +470,6 @@ msgstr "%(partner)s = 业务伙伴名称"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Action Information"
 msgstr "动作信息"
 
@@ -517,7 +482,7 @@ msgstr "%(case_user_phone)s = 负责人电话"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: crm
 #: constraint:ir.actions.act_window:0
@@ -531,13 +496,12 @@ msgstr "条件"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act_open
 msgid "Open Cases"
 msgstr "待处理业务个案"
 
 #. module: crm
-#: field:crm.case.log,name:0
-#: view:crm.claim:0
-#: view:crm.job:0
+#: field:crm.case,state:0
 msgid "Status"
 msgstr "状态"
 
@@ -549,7 +513,7 @@ msgstr "状态"
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
 msgid "Create Opportunity"
-msgstr "创造商机"
+msgstr "建立商机"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -557,7 +521,7 @@ msgstr "创造商机"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -569,9 +533,6 @@ msgstr "会议树"
 #: view:crm.case:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
 msgstr "提升"
@@ -584,13 +545,13 @@ msgstr "所有会议"
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
 msgid "Customer & Supplier Relationship Management"
-msgstr "业务关系管理"
+msgstr "客户&供应商关系管理"
 
 #. module: crm
 #: view:crm.email.add.cc:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
 msgid "Add CC"
-msgstr ""
+msgstr "加入cc"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -598,7 +559,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -608,7 +569,7 @@ msgstr "默认(0=无)"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job7
 msgid "Refused by Company"
-msgstr ""
+msgstr "公司拒绝"
 
 #. module: crm
 #: field:crm.case,planned_revenue:0
@@ -626,12 +587,12 @@ msgstr "允许删除"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
 msgid "Value Proposition"
-msgstr ""
+msgstr "价格建议"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -641,7 +602,7 @@ msgstr "%(case_id)s = 业务个案ID"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
 msgid "New Business"
-msgstr ""
+msgstr "新生意"
 
 #. module: crm
 #: help:crm.case,email_from:0
@@ -659,7 +620,7 @@ msgstr "允许显示日程表。"
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "   Today   "
-msgstr ""
+msgstr "   今天   "
 
 #. module: crm
 #: wizard_view:crm.job.reschedule_phone_call,init:0
@@ -677,17 +638,15 @@ 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 "默认满意度在周期前以最大间隔计算.如果这业务伙伴没有事件这是默认开始满意度"
+msgstr "前期的默认满意度以'最大间隔'计算. 如果业务伙伴没有事件这是默认的开始满意度"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "保险索赔"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
@@ -719,7 +678,7 @@ msgstr "职位招聘流程"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Related Cases"
-msgstr ""
+msgstr "相关的业务个案"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -727,27 +686,22 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Communication history"
 msgstr "沟通日志"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "New Claims"
-msgstr ""
+msgstr "新的索赔"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Form"
-msgstr "会议表"
+msgstr "会议"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor5
@@ -758,17 +712,17 @@ msgstr "协商/审查"
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "在这电话呼叫中一个业务伙伴已定义"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
 msgid "Cases by Opportunities and Stage"
-msgstr "按商机和阶段排列案例"
+msgstr "商机和阶段"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Date of Claim"
-msgstr ""
+msgstr "索赔日期"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -778,12 +732,12 @@ msgstr "业务伙伴细分明细"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
 msgid "All Leads"
-msgstr "所有线索"
+msgstr "所有营销线索"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr "线索单"
+msgstr "营销线索表"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -799,12 +753,12 @@ msgstr "已签订合同"
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
 msgid "Subscribe to Remote ICS"
-msgstr ""
+msgstr "预约远程ICS"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
 msgid "Existing Business"
-msgstr ""
+msgstr "现有生意"
 
 #. module: crm
 #: field:crm.case,probability:0
@@ -815,14 +769,14 @@ msgstr "概率(%)"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Leads Cases"
-msgstr ""
+msgstr "营销线索业务个案"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
 msgid ""
 "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 "cases in this section"
-msgstr "这电子邮件地址设定在这业务个案项所有'回复'的电子邮件"
+msgstr "这电子邮件地址设定为这划分的业务个案所有'回复'的电子邮件"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -850,7 +804,7 @@ msgstr "商机"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Emails"
-msgstr "电子邮件"
+msgstr "Emails"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
@@ -865,12 +819,12 @@ msgstr "停止处理"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "实际索赔"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "查询电话呼叫"
 
 #. module: crm
 #: wizard_button:crm.lead.opportunity_set,create_partner,create:0
@@ -881,7 +835,7 @@ msgstr "继续"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Periode"
-msgstr "周期天数"
+msgstr "每个期间的天数"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
@@ -891,7 +845,7 @@ msgstr "值"
 #. module: crm
 #: help:caldav.crm.export,init,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "保存为.ics格式"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,text:0
@@ -905,7 +859,7 @@ msgid ""
 "Check if the category is limited to partners that match the segmentation "
 "criterions. If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
-msgstr "检查如果分类是仅限于业务伙伴匹配的细分标准.如果选中,将在分类中移去不匹配的业务伙伴"
+msgstr "检查如果这分类是在与业务伙伴匹配的细分标准. 如果选中, 将在分类中移去不匹配的业务伙伴"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
@@ -917,7 +871,7 @@ msgstr "唯一的"
 msgid ""
 "Category related to the section.Subdivide the CRM cases independently or "
 "section-wise."
-msgstr ""
+msgstr "这划分的业务个案有关的分类, 把这CRM的业务个案独立划分或再划分"
 
 #. module: crm
 #: field:crm.case.rule,act_state:0
@@ -953,12 +907,12 @@ msgstr "触发日期"
 #. module: crm
 #: view:crm.case.history:0
 msgid "Search Histories"
-msgstr "搜索历史记录"
+msgstr "搜索日志"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of case stages."
-msgstr ""
+msgstr "在显示业务个案阶段列表时提供序列顺序"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support3
@@ -966,12 +920,12 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr "商机列表"
+msgstr "商机"
 
 #. module: crm
 #: help:crm.segmentation,name:0
 msgid "The name of the segmentation."
-msgstr "细分名称"
+msgstr "细分的名称"
 
 #. module: crm
 #: field:crm.case.rule,trg_partner_categ_id:0
@@ -982,7 +936,7 @@ msgstr "业务伙伴分类"
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
 msgid "Use The Sales Purchase Rules"
-msgstr "使用的销售采购规则"
+msgstr "使用这销售采购规则"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -992,7 +946,7 @@ msgstr "采购金额"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Direction"
-msgstr ""
+msgstr "趋势"
 
 #. module: crm
 #: help:crm.case,email_cc:0
@@ -1000,7 +954,7 @@ msgstr ""
 msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
-msgstr ""
+msgstr "这些人将收到业务伙伴和用户未来通信的邮件副本"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -1008,12 +962,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Server Action to be Triggered"
-msgstr ""
+msgstr "服务器动作被触发"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_rule-act
@@ -1025,7 +979,7 @@ msgstr "规则"
 #: wizard_view:crm.job.meeting_set,init:0
 #: wizard_view:crm.phonecall.meeting_set,init:0
 msgid "Plan Meeting"
-msgstr ""
+msgstr "计划会议"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,state:0
@@ -1056,12 +1010,12 @@ msgstr "<"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_description)s = Case description"
-msgstr "%(case_description)s = 案例描述"
+msgstr "%(case_description)s = 业务个案描述"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "My Funds"
-msgstr ""
+msgstr "我的款项"
 
 #. module: crm
 #: field:crm.case,partner_mobile:0
@@ -1092,7 +1046,7 @@ msgstr "初级软件开发人员"
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr "我的会议列表"
+msgstr "我的会议"
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1107,12 +1061,12 @@ msgstr "预防"
 #. module: crm
 #: field:crm.case.rule,act_email_cc:0
 msgid "Add watchers (Cc)"
-msgstr "新增关注者"
+msgstr "新增关注者(Cc)"
 
 #. module: crm
 #: wizard_view:caldav.crm.export,init:0
 msgid "Export ICS"
-msgstr ""
+msgstr "输出ICS"
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
@@ -1122,13 +1076,13 @@ msgstr ""
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "You can not assign Closed Case."
-msgstr ""
+msgstr "你不能指定结束的业务个案"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_partner:0
 msgid ""
 "Check this if you want the rule to send a reminder by email to the partner."
-msgstr "如果你想发提醒电子邮件给业务伙伴勾选此项"
+msgstr "勾选此项, 如果你想发提醒电子邮件给业务伙伴"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:0
@@ -1138,7 +1092,7 @@ msgstr "如果你想发提醒电子邮件给业务伙伴勾选此项"
 #: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "会议"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1151,10 +1105,8 @@ msgid "Next Action"
 msgstr "下一动作"
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,date_deadline:0
 #: selection:crm.case.rule,trg_date_type:0
-#: view:crm.opportunity:0
 msgid "Deadline"
 msgstr "截止日期"
 
@@ -1178,7 +1130,7 @@ msgstr "业务伙伴细分"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Rule"
-msgstr ""
+msgstr "重现的规则"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
@@ -1197,7 +1149,7 @@ msgstr "主题"
 #. module: crm
 #: field:crm.meeting,attendees:0
 msgid "Attendees"
-msgstr "出席者"
+msgstr "与会者"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -1227,33 +1179,34 @@ msgid ""
 "The CRM module has a email gateway for the synchronisation interface\n"
 "between mails and Open ERP."
 msgstr ""
-"一般系统客户关系管理系统启用群组去有效和理智地管理商机、销售机会、任务、发布、请求、缺陷、营销、服务要求等.\n"
+"客户关系管理(CRM)\n"
+"系统让一群人去聪明和有效地管理: 营销线索、商机、任务、发布、请求、缺陷、营销活动、索赔等.\n"
+"它还管理关键任务如沟通, 指标, 优先权, 指定, 决定和通知.\n"
 "\n"
-"它管理关键任务如沟通,指标,优先权,指定,决议和通知.\n"
+"系统保证所有业务个案都可以成功追踪用户, 客户和供应商. \n"
+"它能根据企业自己的规则自动发送提醒, 更高级别的请求, 触发具体的方法和其它动作.\n"
 "\n"
-"系统保证在所有业务个案能完成跟踪用户,客户和供应商.它能根据企业自己的规则自动发送提醒,升级请求,触发具体的方法和其它行动.\n"
-"\n"
-"系统的最高级的事是用户不需要做任何具体事件.他可以发送邮件来跟踪请求.系统将注意感激信息发到相关人员那"
+"这系统最好在于用户不需做任何特别的操作, 也能发送电子邮件去跟踪请求. 系统会把感谢邮件自动发送到相关的人员手里."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "潜在客户转为业务伙伴"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Regex on Case Name"
-msgstr ""
+msgstr "业务个案名称的正则表达式"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Pending Claims"
-msgstr ""
+msgstr "悬而未决的索赔"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_stage
 msgid "Cases by Opportunities, Category and Stage"
-msgstr "按商机，分类和阶段排列案例"
+msgstr "商机, 分类和阶段"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead4
@@ -1273,7 +1226,7 @@ msgstr "满意度"
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: crm
 #: view:crm.job:0
@@ -1288,7 +1241,7 @@ msgstr "计算细分"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Email"
-msgstr ""
+msgstr "营销线索邮件"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
@@ -1317,24 +1270,18 @@ msgstr "%(partner_email)s = 业务伙伴电子邮箱"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
 msgid "Reset to Draft"
 msgstr "重置为草稿"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
 msgid "Cases by section, Category and Category2"
-msgstr "按组，分类和分类2排列案例"
+msgstr "划分的业务个案, 分类和分类2"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor6
 msgid "Closed Won"
-msgstr ""
+msgstr "关闭成功"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
@@ -1353,19 +1300,19 @@ msgstr "待处理业务个案"
 #: field:report.crm.case.section.categ2,stage_id:0
 #: field:report.crm.case.section.stage,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "阶段"
 
 #. module: crm
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: crm
 #: help:crm.case.section,active:0
 msgid ""
 "If the active field is set to true, it will allow you to hide the case "
 "section without removing it."
-msgstr ""
+msgstr "如果有效字段为真, 它将允许你隐藏这划分的业务个案而不是删除它"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund2
@@ -1376,14 +1323,14 @@ msgstr "学习和教育"
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this phonecall ?"
-msgstr ""
+msgstr "你确定建立基于这电话呼叫的业务伙伴?"
 
 #. module: crm
 #: view:crm.case.stage:0
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "阶段"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
@@ -1395,55 +1342,55 @@ msgstr "预期收益"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "会议日期"
 
 #. module: crm
 #: view:crm.job:0
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Partner"
-msgstr ""
+msgstr "转为业务伙伴"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
 msgid "Next Meetings"
-msgstr ""
+msgstr "下一会议"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr "已处理最大业务伙伴ID"
+msgstr "处理的最大业务伙伴ID"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "You can not delete this case. You should better cancel it."
-msgstr "您不能删除此案例。您最好取消它。"
+msgstr "您不能删除此业务个案. 您最好取消它."
 
 #. module: crm
 #: wizard_button:caldav.crm.subscribe,init,open:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_预约"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_from:0
 msgid "Minimum Priority"
-msgstr "最小优先"
+msgstr "最小优先级"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_generic_wizard_act
 msgid "Meeting Generic Wizard"
-msgstr ""
+msgstr "会议通用向导"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "索赔价值"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,display:0
 msgid "Message..."
-msgstr ""
+msgstr "消息...."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_assign_wizard
@@ -1453,7 +1400,7 @@ msgstr ""
 #. module: crm
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Category2"
-msgstr ""
+msgstr "划分的业务个案和分类2"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1465,20 +1412,20 @@ msgstr "完成"
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Reminder"
-msgstr ""
+msgstr "提醒"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
 "Check if you want to use this tab as part of the segmentation rule. If not "
 "checked, the criteria beneath will be ignored"
-msgstr "如果你要使用此标签的部分细分规则选上.如果不选择下面的标准将被忽略"
+msgstr "勾选此项, 如果你要使用此标签上的细分规则. 如果不选下面的标准将被忽略"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "open"
-msgstr "open"
+msgstr "待处理"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_attach:0
@@ -1489,7 +1436,7 @@ msgstr "提醒附件"
 #: model:crm.case.categ,name:crm.categ_lead6
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Website"
-msgstr ""
+msgstr "网站"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_user:0
@@ -1506,12 +1453,12 @@ msgstr "执行状态"
 msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
-msgstr ""
+msgstr "帮助你组织招聘工作: 评估, 面试, 集成Email...."
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds"
-msgstr ""
+msgstr "款项"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1523,37 +1470,35 @@ msgstr "草稿"
 #: model:crm.case.stage,name:crm.stage_claim5
 #: model:crm.case.stage,name:crm.stage_meet4
 msgid "Awaiting Response"
-msgstr ""
+msgstr "等待回应"
 
 #. module: crm
 #: field:crm.case,date:0
 #: field:crm.case.log,date:0
 #: selection:crm.case.rule,trg_date_type:0
-#: view:crm.claim:0
-#: view:crm.phonecall:0
 msgid "Date"
 msgstr "日期"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name"
-msgstr ""
+msgstr "候选人姓名"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead2
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Self Generated"
-msgstr ""
+msgstr "自生成"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "不会解决"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Converted"
-msgstr ""
+msgstr "已转换"
 
 #. module: crm
 #: view:crm.case:0
@@ -1563,7 +1508,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Reply to Last Email"
-msgstr ""
+msgstr "最近回复的Email"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1573,32 +1518,27 @@ msgstr "细分说明"
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Gives Location of Meeting"
-msgstr ""
+msgstr "给出会议地点"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "History"
 msgstr "日志"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_job
 msgid "Job Cases"
-msgstr ""
+msgstr "招聘业务个案"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Tree"
-msgstr ""
+msgstr "职位-招聘树"
 
 #. module: crm
 #: field:crm.case.rule,regex_name:0
 msgid "Regular Expression on Case Name"
-msgstr ""
+msgstr "业务个案名称正则表达式"
 
 #. module: crm
 #: field:crm.case,state:0
@@ -1607,7 +1547,7 @@ msgstr ""
 #: field:report.crm.case.section.categ2,state:0
 #: field:report.crm.case.section.stage,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: crm
 #: view:crm.case:0
@@ -1616,40 +1556,18 @@ msgstr "发送提醒"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "References"
-msgstr "参考"
+msgstr "参照"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
-#: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
-#: view:crm.claim:0
-#: view:crm.claim.assign_wizard:0
-#: view:crm.fundraising:0
-#: view:crm.helpdesk.assign_wizard:0
-#: wizard_button:crm.job.meeting_set,init,end:0
-#: wizard_button:crm.job.partner_create,init,end:0
-#: wizard_button:crm.job.reschedule_phone_call,init,end:0
-#: view:crm.lead:0
-#: wizard_button:crm.lead.opportunity_set,create_partner,end:0
-#: wizard_button:crm.lead.opportunity_set,opportunity,end:0
-#: wizard_button:crm.lead.partner_create,init,end:0
-#: view:crm.meeting.generic_wizard:0
-#: wizard_button:crm.new.send.mail,init,end:0
-#: view:crm.opportunity:0
-#: view:crm.opportunity.assign_wizard:0
-#: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
-#: view:crm.phonecall:0
-#: view:crm.phonecall.assign_wizard:0
-#: wizard_button:crm.phonecall.meeting_set,init,end:0
-#: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
-#: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
-#: wizard_button:crm.phonecall.partner_create,init,end:0
-#: wizard_button:crm.send.mail,init,end:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
+#: wizard_button:crm.case.section.menu,design_menu,end:0
+#: wizard_button:crm.case.section.menu,init,end:0
 #, python-format
 msgid "Cancel"
 msgstr "取消"
@@ -1658,43 +1576,43 @@ msgstr "取消"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr "您的公司找不到邮箱ID"
+msgstr "没建立你的公司地址邮箱ID!"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Search Funds"
-msgstr ""
+msgstr "查询款项"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of claim"
-msgstr ""
+msgstr "索赔类型"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Support Tree"
-msgstr ""
+msgstr "帮助平台支援树"
 
 #. module: crm
 #: view:res.partner.events:0
 msgid "General Description"
-msgstr "普通说明"
+msgstr "一般说明"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Other Info"
-msgstr ""
+msgstr "其它信息"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claim Cost"
-msgstr ""
+msgstr "索赔成本"
 
 #. module: crm
 #: view:crm.job:0
 #: view:crm.opportunity:0
 msgid "Schedule a Phone Call"
-msgstr ""
+msgstr "安排一电话呼叫"
 
 #. module: crm
 #: field:crm.case,ref:0
@@ -1704,32 +1622,32 @@ msgstr "参考"
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "例外规则"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
-msgstr ""
+msgstr "勾选此项, 如果你想规定发Email给业务伙伴"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead2
 msgid "Mail"
-msgstr ""
+msgstr "邮件"
 
 #. module: crm
 #: field:crm.case.rule,act_priority:0
 msgid "Set priority to"
-msgstr "设定优先"
+msgstr "设定优先级到"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor2
 msgid "Needs Analysis"
-msgstr ""
+msgstr "需要分析"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr ""
+msgstr "查询索赔"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_body:0
@@ -1739,7 +1657,7 @@ msgstr "邮件内容"
 #. module: crm
 #: help:crm.menu.config_wizard,meeting:0
 msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "管理用户的会议日程表"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1754,7 +1672,7 @@ msgstr "销售金额"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Add a CC"
-msgstr ""
+msgstr "增加Cc"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1762,9 +1680,6 @@ msgid "="
 msgstr "="
 
 #. module: crm
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
 msgstr "名称"
@@ -1772,23 +1687,23 @@ msgstr "名称"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage"
-msgstr ""
+msgstr "销售阶段"
 
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "报警"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_watchers:0
 msgid "Mail to watchers (CC)"
-msgstr ""
+msgstr "邮件发送给关注者(Cc)"
 
 #. module: crm
 #: view:crm.fundraising:0
 #: view:crm.meeting:0
 msgid "Next Meeting"
-msgstr ""
+msgstr "下一会议"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1796,7 +1711,7 @@ msgstr ""
 msgid ""
 "No E-Mail ID Found for your Company address or missing reply address in "
 "section!"
-msgstr "无您公司地址的邮箱ID或缺少该项的回复地址!"
+msgstr "没有您公司的邮箱ID地址或缺少该划分的业务个案的回复地址!"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -1806,21 +1721,16 @@ msgstr "允许删除不是草稿的业务个案"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor7
 msgid "Closed Lost"
-msgstr ""
+msgstr "关闭并失去"
 
 #. module: crm
 #: field:crm.menu.config_wizard,bugs:0
 msgid "Bug Tracking"
-msgstr ""
+msgstr "缺陷跟踪"
 
 #. module: crm
 #: view:crm.case:0
 #: view:crm.case.rule:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Actions"
 msgstr "动作"
 
@@ -1835,7 +1745,7 @@ msgstr "高"
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "把潜在客户转成业务伙伴"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1845,27 +1755,27 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_set_rrule
 msgid "Set RRULE"
-msgstr ""
+msgstr "设置规则"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor4
 msgid "Proposal/Price Quote"
-msgstr ""
+msgstr "提议/ 报价"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Delay After Trigger Date:"
-msgstr "耽搁后的触发日期:"
+msgstr "触发日期后推延:"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead5
 msgid "Web"
-msgstr ""
+msgstr "Web"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Campaign Type"
-msgstr ""
+msgstr "营销活动类型"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1877,7 +1787,7 @@ msgstr "满意度计算"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting_generic_wizard
@@ -1887,12 +1797,12 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_history-act
 msgid "Histories"
-msgstr ""
+msgstr "日志"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job1
 msgid "Graduate"
-msgstr ""
+msgstr "大学毕业"
 
 #. module: crm
 #: wizard_view:crm.job.meeting_set,init:0
@@ -1900,28 +1810,28 @@ msgstr ""
 msgid ""
 "Note that you can also use the calendar view to graphically schedule your "
 "next meeting."
-msgstr ""
+msgstr "请注意您可以使用日程表视图通过图表安排下一个会议"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Tree"
-msgstr ""
+msgstr "营销线索树"
 
 #. module: crm
 #: field:crm.meeting,caldav_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Caldav 服务的URL"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee"
-msgstr ""
+msgstr "与会者"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email Fail!"
-msgstr ""
+msgstr "Email失败!"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1929,12 +1839,12 @@ msgstr ""
 #: 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 "来电"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "错误！你不能创建递归的划分"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm
@@ -1946,7 +1856,7 @@ msgstr "业务关系管理"
 msgid ""
 " Will allow you to synchronise your Open ERP calendars with your phone, "
 "outlook, Sunbird, ical, ..."
-msgstr ""
+msgstr " 让您将系统日程表与你的电话、微软outlook, Sunbird, ical, 等同步"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -1954,7 +1864,7 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Year"
-msgstr ""
+msgstr "今年"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_partner:0
@@ -1972,7 +1882,7 @@ msgstr "最高"
 #. module: crm
 #: view:crm.job:0
 msgid "Contract Data"
-msgstr ""
+msgstr "合同数据"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -1982,12 +1892,12 @@ msgstr "天"
 #. module: crm
 #: help:crm.menu.config_wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on software"
-msgstr ""
+msgstr "公司采用的用于跟踪缺陷和支持请求的软件"
 
 #. module: crm
 #: field:crm.menu.config_wizard,document_ics:0
 msgid "Shared Calendar"
-msgstr ""
+msgstr "共享的日程表"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -1997,43 +1907,43 @@ msgstr "回复到"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ
 msgid "Cases by Leads and Type"
-msgstr ""
+msgstr "营销线索业务个案和类型"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
 msgid "Minutes"
-msgstr "分"
+msgstr "分钟"
 
 #. module: crm
 #: field:report.crm.case.section.categ2,amount_revenue:0
 #: field:report.crm.case.section.stage,amount_revenue:0
 msgid "Est.Revenue"
-msgstr ""
+msgstr "估计收入"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job1
 msgid "Initial Jobs Demand"
-msgstr ""
+msgstr "初步招聘需求"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_to:0
 msgid "Maximim Priority"
-msgstr "最大优先"
+msgstr "最大优先级"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
 msgid "OPAQUE"
-msgstr ""
+msgstr "不清晰"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claims Info"
-msgstr ""
+msgstr "索赔信息"
 
 #. module: crm
 #: field:crm.case.category2,name:0
 msgid "Case Category2 Name"
-msgstr ""
+msgstr "业务个案分类2名称"
 
 #. module: crm
 #: wizard_view:crm.lead.opportunity_set,opportunity:0
@@ -2041,29 +1951,29 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_opportunity_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_opportunity_set
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "转为商机"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone2
 #: view:crm.phonecall:0
 msgid "Held"
-msgstr ""
+msgstr "保留"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Supports"
-msgstr ""
+msgstr "帮助平台支持"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support4
 #: model:ir.ui.menu,name:crm.menu_crm_case_fund_raise
 msgid "Fund Raising"
-msgstr ""
+msgstr "筹款"
 
 #. module: crm
 #: selection:crm.new.send.mail,init,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "未更改"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -2072,7 +1982,7 @@ msgstr ""
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Convert To Partner"
-msgstr ""
+msgstr "转为业务伙伴"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_from:0
@@ -2081,34 +1991,29 @@ msgstr "业务个案状态"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Send"
 msgstr "发送"
 
 #. module: crm
 #: field:crm.case,priority:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Priority"
-msgstr "优先级(0=紧急)"
+msgstr "优先级"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Source"
-msgstr ""
+msgstr "源"
 
 #. module: crm
 #: field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "地点"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "付款方式"
 
 #. module: crm
 #: help:crm.case.rule,trg_date_range:0
@@ -2116,32 +2021,27 @@ msgid ""
 "Delay After Trigger Date, specifies you can put a negative number if you "
 "need a delay before the trigger date, like sending a reminder 15 minutes "
 "before a meeting."
-msgstr ""
+msgstr "触发日期后的推延,  如果你需要一个触发日期前的推延你可以指定一个负数, 如在一个会议提前15分钟发一个提醒."
 
 #. module: crm
 #: view:crm.claim:0
 #: view:crm.job:0
 #: view:crm.lead:0
 msgid "Stage: "
-msgstr ""
+msgstr "阶段： "
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Case section"
-msgstr "业务个案项"
+msgstr "划分的业务个案"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "安排正常会议或电话会议"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/crm_claim.py:0
-#: code:addons/crm/crm_helpdesk.py:0
-#: code:addons/crm/crm_meeting.py:0
-#: code:addons/crm/crm_opportunity.py:0
-#: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
 msgstr "错误！"
@@ -2149,12 +2049,12 @@ msgstr "错误！"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Fields to Change"
-msgstr "字段改变"
+msgstr "更改字段"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "电话销售"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
@@ -2164,12 +2064,12 @@ msgstr "业务个案日志"
 #. module: crm
 #: field:crm.case,create_date:0
 msgid "Created"
-msgstr "创建日期"
+msgstr "已创建"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Information"
-msgstr ""
+msgstr "营销线索信息"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -2181,34 +2081,34 @@ msgstr "细分明细"
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
 #: view:crm.phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "计划日期"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
 msgid "Hours"
-msgstr "小时"
+msgstr "小时数"
 
 #. module: crm
 #: help:crm.menu.config_wizard,phonecall:0
 msgid ""
 "Helps you to encode the result of a phone call or to plan a list of phone "
 "calls to process."
-msgstr ""
+msgstr "帮助你编辑一个电话呼叫或计划处理电话呼叫列表"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_import
 msgid "Import ICS File"
-msgstr ""
+msgstr "导入ICS文件"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee Detail"
-msgstr ""
+msgstr "与会者详述"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job3
 msgid " > Bac +5"
-msgstr ""
+msgstr " > Bac +5"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -2216,48 +2116,48 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor1
 msgid "Prospecting"
-msgstr ""
+msgstr "探查"
 
 #. module: crm
 #: field:crm.case,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "员工Email"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting
 msgid "Meeting Cases"
-msgstr ""
+msgstr "会议业务个案"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Job Info"
-msgstr ""
+msgstr "工作信息"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Cancel Meeting"
-msgstr ""
+msgstr "取消会议"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support0
 msgid "Jobs"
-msgstr ""
+msgstr "招聘"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_date)s = Creation date"
-msgstr "%(case_date)s = Creation date"
+msgstr "%(case_date)s = 创建日期"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone3
 #: view:crm.phonecall:0
 msgid "Not Held"
-msgstr ""
+msgstr "不保留"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_user:0
@@ -2267,22 +2167,22 @@ msgstr "发送邮件到负责人"
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "职位招聘表格"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "纠正的"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity
 msgid "Opportunity Cases"
-msgstr ""
+msgstr "商机业务个案"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Support Query"
-msgstr ""
+msgstr "支持查询"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2295,7 +2195,7 @@ msgstr "发送邮件模板"
 #: field:report.crm.case.section.categ2,month:0
 #: field:report.crm.case.section.stage,month:0
 msgid "Month"
-msgstr ""
+msgstr "月份"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support2
@@ -2305,23 +2205,23 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "营销线索"
 
 #. module: crm
 #: wizard_button:crm.new.send.mail,init,send:0
 #: wizard_button:crm.send.mail,init,send:0
 msgid "Send Email"
-msgstr ""
+msgstr "发送Email"
 
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
 msgid "Set case state to"
-msgstr ""
+msgstr "设业务个案状态为"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund3
 msgid "Credit Card"
-msgstr ""
+msgstr "信用卡"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2329,12 +2229,12 @@ msgstr ""
 msgid ""
 "No E-Mail ID Found for the Responsible Partner or missing reply address in "
 "section!"
-msgstr "没有找到业务伙伴的邮箱地址"
+msgstr "没有找到负责业务伙伴的邮箱ID或这缺少这业务个案的回复地址"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Search Jobs"
-msgstr ""
+msgstr "查询招聘"
 
 #. module: crm
 #: field:crm.case.history,log_id:0
@@ -2345,22 +2245,22 @@ msgstr "日志"
 #: help:crm.menu.config_wizard,fund:0
 msgid ""
 "This may help associations in their fund raising process and tracking."
-msgstr ""
+msgstr "这也许有助于协会筹款的进程和跟踪"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "重置为未确认"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Support"
-msgstr ""
+msgstr "帮助平台支持"
 
 #. module: crm
 #: field:crm.case,email_cc:0
 msgid "Watchers Emails"
-msgstr "关注者的电子邮件"
+msgstr "关注者Email"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2373,7 +2273,7 @@ msgstr "备注"
 #: field:report.crm.case.section.categ2,delay_close:0
 #: field:report.crm.case.section.stage,delay_close:0
 msgid "Delay Close"
-msgstr ""
+msgstr "推延关闭"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -2385,21 +2285,13 @@ msgstr "低"
 
 #. module: crm
 #: field:crm.case,date_closed:0
-#: selection:crm.case,state:0
-#: selection:crm.case.rule,act_state:0
-#: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 msgid "Closed"
 msgstr "已关闭"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name2"
-msgstr ""
+msgstr "候选人姓名2"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2410,7 +2302,7 @@ msgstr "取消"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "内部会议"
 
 #. module: crm
 #: view:crm.case:0
@@ -2419,14 +2311,14 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Events"
-msgstr ""
+msgstr "事件"
 
 #. module: crm
 #: help:crm.menu.config_wizard,lead:0
 msgid ""
 "Allows you to track and manage leads which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
-msgstr ""
+msgstr "允许你跟踪和管理营销线索哪个售前请求或联系,  第一次接触客户的需求."
 
 #. module: crm
 #: help:crm.case,som:0
@@ -2434,37 +2326,37 @@ msgid ""
 "The minds states allow to define a value scale which representsthe partner "
 "mentality in relation to our services.The scale hasto be created with a "
 "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
-msgstr ""
+msgstr "满意度允许你去定义一个有关我们服务的负责业务伙伴的满意价值尺度, 从0(非常不满意)到10(非常满意)"
 
 #. module: crm
 #: field:crm.meeting,freebusy:0
 msgid "FreeBusy"
-msgstr ""
+msgstr "繁忙"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "客户会议"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc2:0
 msgid "Attachment2"
-msgstr ""
+msgstr "附件2"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc3:0
 msgid "Attachment3"
-msgstr ""
+msgstr "附件3"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Degree"
-msgstr ""
+msgstr "学位"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc1:0
 msgid "Attachment1"
-msgstr ""
+msgstr "附件1"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:0
@@ -2475,14 +2367,14 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #, python-format
 msgid "Phone Calls"
-msgstr ""
+msgstr "电话呼叫"
 
 #. module: crm
 #: help:crm.case,active:0
 msgid ""
 "If the active field is set to true, it will allow you to hide the case "
 "without removing it."
-msgstr ""
+msgstr "如果这有效字段为真, 将允许你隐藏这业务个案而不是删除它."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_menu_config_wizard
@@ -2497,31 +2389,31 @@ msgstr "业务个案日志"
 #. module: crm
 #: field:crm.case,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "电话"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund2
 msgid "Cheque"
-msgstr ""
+msgstr "支票"
 
 #. module: crm
 #: field:crm.case,active:0
 #: field:crm.case.rule,active:0
 #: field:crm.case.section,active:0
 msgid "Active"
-msgstr "生效"
+msgstr "有效"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_attach:0
 msgid ""
 "Check this if you want that all documents attached to the case be attached "
 "to the reminder email sent."
-msgstr "如果你想将业务个案的所有附属文档附在提醒电子邮件发送勾选此项"
+msgstr "勾选此项, 如果你想将业务个案的所有附属文档附在提醒电子邮件发送"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr "必填表达式"
+msgstr "强制的表达式1"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -2531,17 +2423,17 @@ msgstr ">"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Phone"
-msgstr ""
+msgstr "候选人电话"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
 msgid "Send Mail"
-msgstr ""
+msgstr "发送邮件"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
 msgid "Months"
-msgstr "月"
+msgstr "月份"
 
 #. module: crm
 #: view:crm.claim.assign_wizard:0
@@ -2553,27 +2445,26 @@ msgstr "月"
 #: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall_assign_wizard
 msgid "To Assign"
-msgstr ""
+msgstr "分配"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Please provide Proper URL !"
-msgstr ""
+msgstr "请提供正确的URL!"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "当发现一个明确的项目/ 商机"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this job request ?"
-msgstr ""
+msgstr "你确定要创建这业务伙伴的工作请求?"
 
 #. module: crm
-#: wizard_field:crm.lead.opportunity_set,create_partner,action:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
+#: field:crm.case.log,name:0
 msgid "Action"
 msgstr "动作"
 
@@ -2586,7 +2477,7 @@ msgstr "动作"
 #: model:ir.ui.menu,name:crm.menu_crm_case_claims
 #, python-format
 msgid "Claims"
-msgstr ""
+msgstr "索赔"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
@@ -2596,18 +2487,18 @@ msgstr "下降因子(0.0>1.0)"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_case_history_event
 msgid "History of Events"
-msgstr ""
+msgstr "日志事件"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_category2
 msgid "Category2 of case"
-msgstr ""
+msgstr "业务个案分类2"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,to:0
 #: wizard_field:crm.send.mail,init,to:0
 msgid "To"
-msgstr ""
+msgstr "到"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2617,29 +2508,28 @@ msgstr "%(case_user_email)s = 负责人电子邮箱"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_presale
 msgid "Sales"
-msgstr ""
+msgstr "销售"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.phonecall:0
 msgid "General"
-msgstr "常规"
+msgstr "一般"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Assigned"
-msgstr ""
+msgstr "已分配"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 msgid "Recycled"
-msgstr ""
+msgstr "回收站"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead8
 #: model:crm.case.categ,name:crm.categ_oppor8
 msgid "Other"
-msgstr ""
+msgstr "其它"
 
 #. module: crm
 #: view:crm.case:0
@@ -2649,17 +2539,17 @@ msgstr ""
 #: selection:crm.new.send.mail,init,state:0
 #: view:crm.opportunity:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
-msgstr "最大值"
+msgstr "最大间隔"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
 msgid "All Opportunities"
-msgstr ""
+msgstr "所有商机"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2668,16 +2558,6 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Open"
 msgstr "待处理"
@@ -2685,7 +2565,7 @@ msgstr "待处理"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "PUBLIC"
-msgstr ""
+msgstr "公开"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -2693,36 +2573,26 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already existing with the same name."
-msgstr ""
+msgstr "已经存在有该名称的业务伙伴"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "Phonecall Cases"
-msgstr ""
+msgstr "电话呼叫业务个案"
 
 #. module: crm
 #: help:crm.case.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of case rules."
-msgstr ""
+msgstr "显示业务个案规则时给出序列的顺序"
 
 #. module: crm
 #: field:crm.menu.config_wizard,helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "帮助平台"
 
 #. module: crm
 #: field:crm.case,user_id:0
 #: field:crm.case.rule,trg_user_id:0
-#: view:crm.claim:0
-#: field:crm.claim.assign_wizard,user_id:0
-#: view:crm.fundraising:0
-#: field:crm.helpdesk.assign_wizard,user_id:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: field:crm.meeting.generic_wizard,user_id:0
-#: view:crm.opportunity:0
-#: field:crm.opportunity.assign_wizard,user_id:0
-#: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
 msgstr "负责人"
 
@@ -2730,23 +2600,23 @@ msgstr "负责人"
 #: model:crm.case.stage,name:crm.stage_claim4
 #: model:crm.case.stage,name:crm.stage_meet3
 msgid "Invalid"
-msgstr ""
+msgstr "无效"
 
 #. module: crm
 #: wizard_button:crm.job.meeting_set,init,order:0
 #: wizard_button:crm.phonecall.meeting_set,init,order:0
 msgid "Set Meeting"
-msgstr ""
+msgstr "设定会议"
 
 #. module: crm
 #: field:crm.menu.config_wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr ""
+msgstr "会议日程表"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "业务个案阶段和评估"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2759,43 +2629,43 @@ msgstr "已是最高级别的业务个案你不能再提升"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Name"
-msgstr ""
+msgstr "营销线索名称"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr ""
+msgstr "索赔/ 动作说明"
 
 #. module: crm
 #: field:crm.case.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr "最大通信日志"
+msgstr "最多的沟通日志"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Meeting For Leads Generation"
-msgstr ""
+msgstr "产生的营销线索会议"
 
 #. module: crm
 #: wizard_view:crm.lead.opportunity_set,create_partner:0
 #: wizard_view:crm.lead.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this lead ?"
-msgstr ""
+msgstr "你确定要根据这营销线索创建这业务伙伴？"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job6
 msgid "Refused by Employee"
-msgstr ""
+msgstr "员工拒绝"
 
 #. module: crm
 #: field:crm.case,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "员工姓名"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job2
 msgid "First Interview"
-msgstr ""
+msgstr "第一次面试"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -2803,17 +2673,17 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Month"
-msgstr ""
+msgstr "本月"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Availability (weeks)"
-msgstr ""
+msgstr "可用(周)"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Opportunities Tree"
-msgstr ""
+msgstr "商机树"
 
 #. module: crm
 #: help:crm.case,state:0
@@ -2826,69 +2696,73 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"当一个业务个案创建时状态设为'草稿'\n"
+"如果业务个案正在处理状态设为'待处理'\n"
+"当业务个案结束状态设为'完成'\n"
+"如果业务个案需要审查状态设为'悬而未决'"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Open Jobs"
-msgstr ""
+msgstr "待处理的招聘"
 
 #. module: crm
 #: selection:crm.email.add.cc,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "邮件地址"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
 msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
-msgstr "对在此期间所有事件进行计算"
+msgstr "此计算是基于在在此期间发生的所有事件, 过去的X期间"
 
 #. module: crm
 #: field:crm.case,case_id:0
 msgid "Related Case"
-msgstr ""
+msgstr "相关业务个案"
 
 #. module: crm
 #: field:crm.case.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "服务器动作"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
 msgid "All Claims"
-msgstr ""
+msgstr "所有索赔"
 
 #. module: crm
 #: field:crm.case.log,user_id:0
 msgid "User Responsible"
-msgstr "负责的用户"
+msgstr "用户责任"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Email not sent !"
-msgstr ""
+msgstr "Email没有发送!"
 
 #. module: crm
 #: wizard_field:crm.phonecall.partner_create,init,close:0
 msgid "Close Phonecall"
-msgstr ""
+msgstr "关闭电话呼叫"
 
 #. module: crm
 #: field:crm.case,email_last:0
 msgid "Latest E-Mail"
-msgstr "最近的电子邮件"
+msgstr "最近的Email"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Regex on Communication History"
-msgstr ""
+msgstr "沟通日志的正则表达式"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund4
 msgid "Demand Draft"
-msgstr ""
+msgstr "汇票"
 
 #. module: crm
 #: field:crm.case,id:0
@@ -2904,12 +2778,12 @@ msgstr "日志"
 #: wizard_field:crm.lead.opportunity_set,opportunity,name:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0
 msgid "Opportunity Summary"
-msgstr ""
+msgstr "商机综述"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Search Case"
-msgstr ""
+msgstr "查询业务个案"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2925,7 +2799,7 @@ msgstr "业务个案说明"
 #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "分配到"
 
 #. module: crm
 #: field:crm.case,date_action_last:0
@@ -2935,24 +2809,26 @@ msgstr "最近动作"
 #. module: crm
 #: field:crm.case,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "持续时间"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_stage
 msgid "Cases by section, Category and stage"
-msgstr ""
+msgstr "划分的业务个案, 分类和阶段"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Hired"
-msgstr ""
+msgstr "雇佣候选人"
 
 #. module: crm
 #: field:crm.menu.config_wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "招聘流程"
 
 #. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_52
 msgid "All Cases"
 msgstr "所有业务个案"
@@ -2961,12 +2837,12 @@ msgstr "所有业务个案"
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this lead."
-msgstr ""
+msgstr "此营销线索已定义业务伙伴"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Source"
-msgstr ""
+msgstr "营销线索来源"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,nbr:0
@@ -2974,17 +2850,17 @@ msgstr ""
 #: field:report.crm.case.section.categ2,nbr:0
 #: field:report.crm.case.section.stage,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# 业务个案"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "PRIVATE"
-msgstr ""
+msgstr "私人的"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
 msgid "Provide path for Remote Calendar"
-msgstr ""
+msgstr "远程日程表提供路径"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2995,28 +2871,28 @@ msgstr "细分"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "款项表格"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "查询会议"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "创建新的业务伙伴"
 
 #. module: crm
 #: field:crm.case,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "In Process"
-msgstr ""
+msgstr "处理中"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3032,18 +2908,18 @@ msgstr "%(case_user)s = 负责人"
 #: wizard_field:crm.job.reschedule_phone_call,init,note:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0
 msgid "Goals"
-msgstr ""
+msgstr "得分"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Type"
-msgstr ""
+msgstr "划分的业务个案和类型"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "售后服务"
 
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
@@ -3051,31 +2927,30 @@ msgstr ""
 #: wizard_button:caldav.crm.subscribe,display,end:0
 #: view:crm.email.add.cc:0
 msgid "Ok"
-msgstr ""
+msgstr "确定"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "文件名"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "查询营销线索"
 
 #. module: crm
 #: help:crm.case.rule,active:0
 msgid ""
 "If the active field is set to true, it will allow you to hide the case rule "
 "without removing it."
-msgstr ""
+msgstr "如果有效字段为真, 它允许你隐藏这业务个案而不删除它."
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Error!"
-msgstr "错误！"
+msgstr "错误!"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim_assign_wizard
@@ -3086,7 +2961,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job
 msgid "All Jobs Requests"
-msgstr ""
+msgstr "所有招聘请求"
 
 #. module: crm
 #: selection:crm.case,state:0
@@ -3098,44 +2973,44 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,state:0
 #: selection:report.crm.case.section.stage,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Applied Job"
-msgstr ""
+msgstr "申请工作"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
 msgid ""
 "defines a rule or repeating pattern                                 for "
 "anexception to a recurrence set"
-msgstr ""
+msgstr "定义异常复发设置的一个规则或重复模式"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Relevant"
-msgstr ""
+msgstr "相关的"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0
 msgid "Opportunity Name"
-msgstr ""
+msgstr "商机名称"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "周期性规则"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,init:0
 msgid "Import ICS"
-msgstr ""
+msgstr "导入 ICS"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Summary"
-msgstr ""
+msgstr "呼叫概要"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -3150,7 +3025,7 @@ msgstr "业务个案沟通日志"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ
 msgid "Cases by Opportunities and Type"
-msgstr ""
+msgstr "商机业务个案和类型"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3161,19 +3036,8 @@ msgstr "%(case_subject)s = 业务个案主题"
 #: field:crm.case,section_id:0
 #: field:crm.case.log,section_id:0
 #: field:crm.case.rule,trg_section_id:0
-#: field:crm.claim.assign_wizard,section_id:0
-#: field:crm.helpdesk.assign_wizard,section_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,section_id:0
-#: field:crm.meeting.generic_wizard,section_id:0
-#: field:crm.opportunity.assign_wizard,section_id:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,section_id:0
-#: field:crm.phonecall.assign_wizard,section_id:0
-#: field:report.crm.case.section.categ.categ2,section_id:0
-#: field:report.crm.case.section.categ.stage,section_id:0
-#: field:report.crm.case.section.categ2,section_id:0
-#: field:report.crm.case.section.stage,section_id:0
 msgid "Section"
-msgstr "项"
+msgstr "划分的业务个案"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -3183,18 +3047,18 @@ msgstr "可选表达式"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund1
 msgid "Social Rehabilitation And Rural Upliftment"
-msgstr ""
+msgstr "社会救援和农村振兴"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this job request."
-msgstr ""
+msgstr "业务伙伴已定义这工作要求"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
 msgid "New"
-msgstr ""
+msgstr "新建"
 
 #. module: crm
 #: field:crm.case,description:0
@@ -3202,10 +3066,7 @@ msgid "Your action"
 msgstr "你的动作"
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_lead3
 #: field:crm.case.history,email:0
-#: field:crm.email.add.cc,email:0
-#: view:crm.job:0
 msgid "Email"
 msgstr "Email"
 
@@ -3218,42 +3079,42 @@ msgstr "渠道"
 #. module: crm
 #: help:crm.case.rule,act_mail_to_email:0
 msgid "Email-id of the persons whom mail is to be sent"
-msgstr ""
+msgstr "Emaii- ID是给谁发送的邮件"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim
 msgid "Claim Cases"
-msgstr ""
+msgstr "索赔业务个案"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "E-Mail Reminders (includes the content of the case)"
-msgstr "电子邮件提醒(含业务个案内容)"
+msgstr "提醒电子邮件(含业务个案内容)"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_stage
 msgid "Cases by Leads and Stage"
-msgstr ""
+msgstr "营销线索业务个案和阶段"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "异常日期/ 时间"
 
 #. module: crm
 #: view:crm.meeting.generic_wizard:0
 msgid "Generic Wizard"
-msgstr ""
+msgstr "通用向导"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "从营销线索创建商机"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_64
 msgid "Reporting"
-msgstr ""
+msgstr "报表"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3262,29 +3123,19 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0
-#: view:crm.opportunity:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Pending"
-msgstr "未结的"
+msgstr "悬而未决"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "探查商机"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Expected Salary"
-msgstr ""
+msgstr "期望工资"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_configuration
@@ -3294,64 +3145,64 @@ msgstr "设置"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail
 msgid "Send New Mail"
-msgstr ""
+msgstr "发送新邮件"
 
 #. module: crm
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "无效的参数"
 
 #. module: crm
 #: field:crm.meeting,transparent:0
 msgid "Trensparent"
-msgstr ""
+msgstr "清晰的"
 
 #. module: crm
 #: view:crm.case:0
 msgid "My Cases"
-msgstr ""
+msgstr "我的业务个案"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead7
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Word of mouth"
-msgstr ""
+msgstr "口头上"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Subject"
-msgstr ""
+msgstr "营销线索主题"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "转换到商机"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone1
 msgid "Planned"
-msgstr ""
+msgstr "计划"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet3
 msgid "Customer Office"
-msgstr ""
+msgstr "客户办公室"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Email"
-msgstr ""
+msgstr "候选人Email"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage: "
-msgstr ""
+msgstr "销售阶段: "
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of Action"
-msgstr ""
+msgstr "动作类型"
 
 #. module: crm
 #: field:crm.case.rule,act_user_id:0
@@ -3361,7 +3212,7 @@ msgstr "设置责任人"
 #. module: crm
 #: view:crm.job:0
 msgid "Meeting With Candidates"
-msgstr ""
+msgstr "候选人面试"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3372,8 +3223,8 @@ msgid ""
 "has decreased because he probably bought goods to another supplier. Use this "
 "functionality for recurring businesses."
 msgstr ""
-"在两个购买或者采购间的平均天数。它主要用来检查一个业务伙伴没有采购或购买的最长时间。如果很长那么我们假设他找了另一个供应商买到了好的货物对我们的满意度下降"
-"。这个功能用在经常性的业务中。"
+"在两个购买或者采购间的平均天数. 它主要用来检查一个业务伙伴没有采购或购买的最长时间. \r\n"
+"如果很长那么我们假设他找了另一个供应商买到了好的货物对我们的满意度下降. 这个功能用在经常性的业务中."
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3381,12 +3232,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 msgid "Search Cases by User"
-msgstr ""
+msgstr "查询用户的业务个案"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3396,12 +3247,12 @@ msgstr "沟通日志的条件"
 #. module: crm
 #: field:crm.case.rule,act_mail_to_partner:0
 msgid "Mail to partner"
-msgstr "发送到业务伙伴"
+msgstr "发邮件到业务伙伴"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Tree"
-msgstr ""
+msgstr "款项树"
 
 #. module: crm
 #: field:crm.case.rule,act_method:0
@@ -3411,24 +3262,38 @@ msgstr "调用对象方法"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1
 msgid "All Funds"
-msgstr ""
+msgstr "所有款项"
 
 #. module: crm
-#: field:crm.case.section,calendar:0
-#: view:crm.meeting:0
-#: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
+#: selection:crm.case.section.menu,design_menu,menu10_option:0
+#: selection:crm.case.section.menu,design_menu,menu11_option:0
+#: selection:crm.case.section.menu,design_menu,menu12_option:0
+#: selection:crm.case.section.menu,design_menu,menu13_option:0
+#: selection:crm.case.section.menu,design_menu,menu14_option:0
+#: selection:crm.case.section.menu,design_menu,menu15_option:0
+#: selection:crm.case.section.menu,design_menu,menu16_option:0
+#: selection:crm.case.section.menu,design_menu,menu17_option:0
+#: selection:crm.case.section.menu,design_menu,menu1_option:0
+#: selection:crm.case.section.menu,design_menu,menu2_option:0
+#: selection:crm.case.section.menu,design_menu,menu3_option:0
+#: selection:crm.case.section.menu,design_menu,menu4_option:0
+#: selection:crm.case.section.menu,design_menu,menu5_option:0
+#: selection:crm.case.section.menu,design_menu,menu6_option:0
+#: selection:crm.case.section.menu,design_menu,menu7_option:0
+#: selection:crm.case.section.menu,design_menu,menu8_option:0
+#: selection:crm.case.section.menu,design_menu,menu9_option:0
 msgid "Calendar"
 msgstr "日程表"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job1
 msgid "Salesman"
-msgstr ""
+msgstr "销售员"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support_help
 msgid "HelpDesk"
-msgstr ""
+msgstr "帮助平台"
 
 #. module: crm
 #: field:crm.case,ref2:0
@@ -3445,12 +3310,12 @@ msgstr "销售采购"
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "会议时间表"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "艺术和文化"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3458,10 +3323,11 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
-msgstr ""
+msgstr "致电"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #, python-format
 msgid "Historize"
 msgstr "日志"
@@ -3469,7 +3335,7 @@ msgstr "日志"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirmed"
-msgstr ""
+msgstr "已确认"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3481,7 +3347,7 @@ msgstr "未运行"
 #: wizard_field:crm.lead.opportunity_set,opportunity,probability:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "成功概率"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3489,11 +3355,6 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.meeting:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Draft"
 msgstr "草稿"
@@ -3501,17 +3362,17 @@ msgstr "草稿"
 #. module: crm
 #: field:crm.case.rule,trg_date_range:0
 msgid "Delay after trigger date"
-msgstr "耽搁的触发日期后"
+msgstr "触发日期后推延"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Details"
-msgstr ""
+msgstr "营销线索细节"
 
 #. module: crm
 #: field:crm.case.rule,act_section_id:0
 msgid "Set section to"
-msgstr "设置项为"
+msgstr "设置划分为"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -3523,11 +3384,9 @@ msgstr "普通"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
-msgstr "此行动需要业务伙伴的电子邮件地址！"
+msgstr "此动作需要业务伙伴的电子邮件地址!"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -3536,17 +3395,17 @@ msgstr "此行动需要业务伙伴的电子邮件地址！"
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "你可能要核实这个业务伙伴是否已不存在"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Qualication"
-msgstr ""
+msgstr "资格"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Change RRule"
-msgstr ""
+msgstr "修改规则"
 
 #. module: crm
 #: selection:crm.email.add.cc,name:0
@@ -3556,14 +3415,14 @@ msgstr ""
 #: field:report.crm.case.section.categ2,user_id:0
 #: field:report.crm.case.section.stage,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_categ2_tree
 #: view:report.crm.case.section.categ.categ2:0
 msgid "Cases by Section, Category and Type"
-msgstr ""
+msgstr "划分的业务个案, 分类和类型"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3571,17 +3430,17 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job2
 msgid "Licenced"
-msgstr ""
+msgstr "取得许可"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Section"
-msgstr "上级项"
+msgstr "上级划分"
 
 #. module: crm
 #: wizard_view:crm.job.reschedule_phone_call,init:0
@@ -3592,14 +3451,14 @@ msgstr "上级项"
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call
 #: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "电话呼叫时间表"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid ""
 "Can not send mail with empty body,you should have description in the body"
-msgstr "无法发送无正文邮件，请添加"
+msgstr "不能发空邮件, 请添加"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3607,17 +3466,17 @@ msgstr "无法发送无正文邮件，请添加"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "合同"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Sections"
-msgstr "子项"
+msgstr "子划分"
 
 #. module: crm
 #: view:crm.case:0
@@ -3627,7 +3486,7 @@ msgstr "计划收入"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund3
 msgid "Healthcare"
-msgstr ""
+msgstr "医疗保健"
 
 #. module: crm
 #: view:crm.case:0
@@ -3641,7 +3500,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:crm.phonecall.assign_wizard:0
 msgid "Assign"
-msgstr ""
+msgstr "分配"
 
 #. module: crm
 #: field:crm.case,partner_address_id:0
@@ -3651,22 +3510,20 @@ msgstr "业务伙伴联系方式"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet1
 msgid "Office"
-msgstr ""
+msgstr "办公室"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_fundraising
 msgid "Fund Raising Cases"
-msgstr ""
+msgstr "筹款业务个案"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "业务个案阶段"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.opportunity:0
 msgid "Estimates"
 msgstr "估计"
 
@@ -3678,6 +3535,10 @@ msgstr "负责用户"
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
 #, python-format
 msgid "Close"
 msgstr "关闭"
@@ -3690,39 +3551,39 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Case Partner"
-msgstr "业务个案条件业务伙伴"
+msgstr "业务个案业务伙伴条件"
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Section Code"
-msgstr "项代码"
+msgstr "划分代码"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,date:0
 #: wizard_field:crm.phonecall.meeting_set,init,date:0
 msgid "Meeting date"
-msgstr ""
+msgstr "会议日期"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "CONFIDENTIAL"
-msgstr ""
+msgstr "机密"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "邮件内容"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet2
 msgid "Not fixed"
-msgstr ""
+msgstr "未解决"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead3
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Employee"
-msgstr ""
+msgstr "员工"
 
 #. module: crm
 #: field:crm.case,email_from:0
@@ -3735,14 +3596,9 @@ msgid "% = The '%' Character"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,name:0
 #: field:crm.case.history,description:0
 #: field:crm.case.history,note:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
 #: field:crm.segmentation,description:0
 msgid "Description"
 msgstr "说明"
@@ -3753,18 +3609,18 @@ msgstr "说明"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "内部备注"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_user:0
 msgid ""
 "Check this if you want the rule to send a reminder by email to the user."
-msgstr "如果你想发提醒电子邮件给负责人勾选此项"
+msgstr "勾选此项, 如果你想规定发提醒Email给用户"
 
 #. module: crm
 #: view:crm.case:0
@@ -3776,29 +3632,21 @@ msgstr "如果你想发提醒电子邮件给负责人勾选此项"
 #: view:crm.opportunity:0
 #: wizard_field:crm.send.mail,init,cc:0
 msgid "CC"
-msgstr ""
+msgstr "抄送"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr "命令/可选的"
+msgstr "强制的/ 可选的"
 
 #. module: crm
 #: wizard_button:caldav.crm.import,init,open:0
 msgid "_Import"
-msgstr ""
+msgstr "导入(_I)"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: field:crm.case.log,case_id:0
-#: field:crm.claim,inherit_case_id:0
-#: field:crm.fundraising,inherit_case_id:0
-#: field:crm.helpdesk,inherit_case_id:0
-#: field:crm.job,inherit_case_id:0
-#: field:crm.lead,inherit_case_id:0
-#: field:crm.meeting,inherit_case_id:0
-#: field:crm.opportunity,inherit_case_id:0
-#: field:crm.phonecall,inherit_case_id:0
 #: model:ir.model,name:crm.model_crm_case
 #: model:res.request.link,name:crm.req_link_case
 #, python-format
@@ -3819,37 +3667,37 @@ msgstr "最低"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_case
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "安排一个会议"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Priority Range"
-msgstr "优先条件范围"
+msgstr "优先级范围条件"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
 "If the partner has not purchased (or buied) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
-msgstr "如果业务伙伴没有购买(或)周期,减少满意度的因子,这是一个乘法"
+msgstr "如果业务伙伴持续一个期间没有购买(或卖), 减少满意度的因子, 这是一个乘法"
 
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
 #: wizard_view:crm.send.mail,init:0
 msgid "Mass Mailing"
-msgstr ""
+msgstr "群发"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "E-Mail Actions"
-msgstr "邮件动作"
+msgstr "Email动作"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,name:0
@@ -3857,22 +3705,22 @@ msgstr "邮件动作"
 #: field:report.crm.case.section.categ2,name:0
 #: field:report.crm.case.section.stage,name:0
 msgid "Year"
-msgstr ""
+msgstr "年份"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund1
 msgid "Cash"
-msgstr ""
+msgstr "现金"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds by Categories"
-msgstr ""
+msgstr "款项分类"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "第一次与新的潜在客户接触"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3880,22 +3728,22 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet5
 msgid "Future"
-msgstr ""
+msgstr "前景"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,file_path:0
 msgid "Save ICS file"
-msgstr ""
+msgstr "保存ICS文件"
 
 #. module: crm
 #: wizard_field:caldav.crm.subscribe,init,url_path:0
 msgid "Provide path for remote calendar"
-msgstr ""
+msgstr "提供远程日程表的路径"
 
 #. module: crm
 #: view:crm.case.log:0
@@ -3910,30 +3758,29 @@ msgstr "时间条件"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_helpdesk
 msgid "Helpdesk Cases"
-msgstr ""
+msgstr "帮助平台业务个案"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_export
 msgid "Export ICS File"
-msgstr ""
+msgstr "输出ICS文件"
 
 #. module: crm
 #: field:crm.case.rule,sequence:0
 #: field:crm.case.section,sequence:0
-#: field:crm.case.stage,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,init:0
 #: wizard_field:caldav.crm.import,init,file_path:0
 msgid "Select ICS file"
-msgstr ""
+msgstr "选择ICS文件"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,display:0
 msgid "Import Message"
-msgstr ""
+msgstr "导入消息"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3944,22 +3791,22 @@ msgstr "控制变量"
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act_tree
 msgid "Cases by section"
-msgstr "业务个案项"
+msgstr "划分的业务个案"
 
 #. module: crm
 #: view:crm.job:0
 msgid "New Jobs"
-msgstr ""
+msgstr "新招聘"
 
 #. module: crm
 #: field:crm.menu.config_wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr ""
+msgstr "筹款运作"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "时事通信"
 
 #~ msgid "My Draft "
 #~ msgstr "我的草稿 "
@@ -3988,9 +3835,6 @@ msgstr ""
 #~ msgid "Complete this if you use the mail gateway."
 #~ msgstr "如果使用此邮件网关请填写完整"
 
-#~ msgid "Add Last Mail for Replying"
-#~ msgstr "增加最近回复邮件"
-
 #~ msgid "this wizard will create all sub-menus, within the selected menu."
 #~ msgstr "这向导将在选择的菜单创建所有子菜单"
 
@@ -4070,9 +3914,6 @@ msgstr ""
 #~ msgid "All "
 #~ msgstr "所有 "
 
-#~ msgid "Send Partner & Historize"
-#~ msgstr "发送到业务伙伴和日志"
-
 #~ msgid "All Histories"
 #~ msgstr "所有日志"
 
@@ -4087,3 +3928,35 @@ msgstr ""
 
 #~ msgid "Included Answers :"
 #~ msgstr "包括回答:"
+
+#~ msgid "All Unclosed and Unassigned "
+#~ msgstr "所有未结束和未分配 "
+
+#~ msgid "Profiling"
+#~ msgstr "特征"
+
+#~ msgid "Profiling Options"
+#~ msgstr "特征选项"
+
+#~ msgid "My Pending "
+#~ msgstr "我未决 的 "
+
+#~ msgid ""
+#~ "These people will receive a copy of the futur communication between partner "
+#~ "and users by email"
+#~ msgstr "这些人将收到一份将来业务伙伴和用户之间沟通的电子邮件的拷贝"
+
+#~ msgid "Tree View"
+#~ msgstr "目录视图"
+
+#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
+#~ msgstr "截止日期为自动计算：开始时间+持续时间"
+
+#~ msgid "Mail to watchers (Cc)"
+#~ msgstr "发送到关注者"
+
+#~ msgid "Add Last Mail for Replying"
+#~ msgstr "回复时增加最近的邮件"
+
+#~ msgid "Send Partner & Historize"
+#~ msgstr "发送到业务伙伴和记载"
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 208054b3f4d..4f6f39e0690 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -76,6 +76,7 @@ class crm_lead_report(osv.osv):
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'country_id':fields.many2one('res.country', 'Country', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
@@ -96,6 +97,7 @@ class crm_lead_report(osv.osv):
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
         'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"),
         'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
+        'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]" , readonly=True),
@@ -141,7 +143,9 @@ class crm_lead_report(osv.osv):
                     c.section_id,
                     c.categ_id,
                     c.partner_id,
+                    c.country_id,
                     c.planned_revenue,
+                    c.planned_revenue*(c.probability/100) as probable_revenue, 
                     1 as nbr,
                     0 as avg_answers,
                     0.0 as perc_done,
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 4086a04ee9d..36e0633cfe9 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.lead.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            <tree string="Leads Analysis">
+            <tree colors="blue:state in ('draft');black:state in ('open','pending','done');gray:state in ('cancel') " string="Leads Analysis">
                 <field name="name" invisible="1"/>
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
@@ -59,7 +59,7 @@
                 </graph>
             </field>
         </record>
-        
+
 <!-- Leads by user and section Search View -->
 
         <record id="view_report_crm_lead_filter" model="ir.ui.view">
@@ -104,6 +104,7 @@
                         <filter string="User" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                       <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Section" icon="terp-personal+"
                             domain="[]"
@@ -130,10 +131,10 @@
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
                   <newline/>
-                  <group  expand="0" string="Extended options..." groups="base.group_extended">
+                  <group  expand="0" string="Extended Filters..." groups="base.group_extended">
                       <field name="partner_id"/>
                       <separator orientation="vertical"/>
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                       <separator orientation="vertical"/>
                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -153,12 +154,13 @@
             <field name="model">crm.lead.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            <tree string="Opportunities Analysis">
+            <tree colors="blue:state in ('draft');black:state in ('open','pending','done');gray:state in ('cancel') " string="Opportunities Analysis">
                 <field name="name" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="section_id" invisible="1" groups="base.group_extended"/>
                 <field name="user_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
+                <field name="country_id" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
@@ -173,6 +175,7 @@
                 <field name="delay_close" sum='Delay to close'/>
                 <field name="delay_expected"/>
                 <field name="probability" widget="progressbar"/>
+                <field name="probable_revenue"/>
              </tree>
             </field>
         </record>
@@ -186,6 +189,7 @@
             <field name="context">{'search_default_lead':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
             <field name="domain">[('type', '=', 'lead')]</field>
+            <field name="help">Leads Analysis allows you to consult different informations relative to CRM. Check for treatments delays, number of responses given and emails send. You can sort out your leads analysis on different groups to get fine grained analysis.</field>
         </record>
 
        <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
@@ -209,6 +213,7 @@
             <field name="context">{"search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
             <field name="domain">[('type', '=', 'opportunity')]</field>
+            <field name="help">Opportunities Analysis menu gives you an instant access to your opportunities like expected revenue, planned cost, overpassed deadline or the number of exchanges by opportunity.</field>
         </record>
 
        <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 5e809d16472..120bc9f859d 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.phonecall.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-               <tree string="Phone calls">
+               <tree colors="blue:state in ('draft');black:state in ('open','pending','done');gray:state in ('cancel') " string="Phone calls">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="section_id" invisible="1"/>
@@ -145,7 +145,7 @@
                   </group>
 
                    <newline/>
-                   <group  expand="0" string="Extended options..."  groups="base.group_extended">
+                   <group  expand="0" string="Extended Filters..."  groups="base.group_extended">
                       <field name="partner_id"/>
                         <separator orientation="vertical"/>
                         <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
@@ -171,6 +171,7 @@
             <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_phonecall_tree"/>
             <field name="search_view_id" ref="view_report_crm_phonecall_filter"/>
+            <field name="help">Get an anlysis of Phone Calls number and delay to close, stage, user suits to different groups for a global or a fine grained analysis.</field>
         </record>
 
            <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 2dbae32ad98..db7069af4db 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -26,11 +26,13 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
         'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
-            'Leads and Opportunities'), 
+            'Leads and Opportunities'),
         'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
-            'Meetings'), 
+            'Meetings'),
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
-            'Phonecalls'), 
+            'Phonecalls'),
+        'opportunity_assigned_ids': fields.one2many('crm.lead', 'partner_assigned_id',\
+            'Assigned Opportunities'), 
     }
 res_partner()
 
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 3ae772b2b85..4fa91b0ac39 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -12,7 +12,40 @@
             <field name="arch" type="xml">
                 <page string="History" position="inside">
                     <field name="opportunity_ids" colspan="4" nolabel="1">
-                         <tree string="Opportunities"  colors="blue:state=='pending';grey:state=='cancel')">
+                         <tree string="Opportunities"  colors="blue:state=='pending';gray:state=='cancel')">
+                             <field name="create_date"/>
+                             <field name="name"/>
+                             <field name="type"/>
+                             <field name="stage_id"/>
+                             <button name="stage_previous" string="Previous"
+                                 states="open,pending" type="object" icon="gtk-go-back" />
+                             <button name="stage_next" string="Next"
+                                 states="open,pending" type="object"
+                                 icon="gtk-go-forward" />
+                             <field name="section_id"
+                                 invisible="context.get('invisible_section', True)" />
+                             <field name="user_id" />
+                             <field name="state" />
+                             <button name="case_open" string="Open"
+                                 states="draft,pending" type="object"
+                                 icon="gtk-go-forward" />
+                             <button name="case_close" string="Close"
+                                 states="open,draft,pending" type="object"
+                                 icon="gtk-close" />
+                             <button string="Convert to Opportunity"
+                                 name="convert_opportunity"
+                                 states="draft,open,pending" icon="gtk-index"
+                                 type="object" />
+                             <button name="case_escalate" string="Escalate"
+                                 states="open,draft,pending" type="object"
+                                 icon="gtk-go-up" />
+                             <button name="case_cancel" string="Cancel"
+                                 states="draft,open,pending" type="object"
+                                 icon="gtk-cancel" />
+                         </tree>
+                    </field>
+                    <field name="opportunity_assigned_ids" colspan="4" nolabel="1">
+                         <tree string="Assigned Opportunities"  colors="blue:state=='pending';gray:state=='cancel')">
                              <field name="create_date"/>
                              <field name="name"/>
                              <field name="type"/>
diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml
index 6365c913b1f..ef86261f091 100644
--- a/addons/crm/test/test_crm_meeting.yml
+++ b/addons/crm/test/test_crm_meeting.yml
@@ -55,8 +55,8 @@
   I will search for one of the recurrent event and count the number of meeting.
 -
   !python {model: crm.meeting}: |
-     ids = self.search(cr, uid, [('date', '>=', '2010-05-21 00:00:00'), ('date', '<=', '2010-04-21 00:00:00')] )
-     assert len(ids) == 9      
+     ids = self.search(cr, uid, [('date', '>=', '2010-04-21 00:00:00'), ('date', '<=', '2010-05-21 00:00:00')] )
+     assert len(ids) == 10      
 
 - |
   Now If I want to edit meetings information for all occurence I click on "Edit All" button.
@@ -81,11 +81,6 @@
     partner_id: base.res_partner_9
     user_ids:
       - base.user_demo
-- |
-  If I set Send mail boolean as True I can see that an email is send to 
-    specified email address with proper meeting information.
--
-  #This is not working for send mail boolean as True.
 -
   I click on "Invite" button of "Invite attendee" wizard.    
 -
diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
index af28c19a10e..1351ba88199 100644
--- a/addons/crm/test/test_crm_phonecall.yml
+++ b/addons/crm/test/test_crm_phonecall.yml
@@ -72,7 +72,6 @@
     partner_address_id: base.res_partner_address_1
     partner_id: base.res_partner_9
     phonecall_id: 'crm_phonecall_interviewcall0'
-    rrule_type: weekly
     state: open
   
 - |
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 8c6a650b8da..70dd08a23cf 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -31,6 +31,8 @@ import crm_phonecall_to_opportunity
 import crm_partner_to_opportunity
 
 import crm_custom_create_menu
+import crm_merge_opportunities
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 1e323eddedb..aaa26c438b6 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -21,8 +21,8 @@
 ##############################################################################
 
 import base64
-import itertools
-
+import time
+import re
 from osv import osv, fields
 import tools
 from tools.translate import _
@@ -30,6 +30,7 @@ from tools.translate import _
 class crm_lead_forward_to_partner(osv.osv_memory):
     """Forwards lead history"""
     _name = 'crm.lead.forward.to.partner'
+    _inherit = "crm.send.mail"
 
     _columns = {
         'name': fields.selection([('user', 'User'), ('partner', 'Partner'), \
@@ -37,19 +38,12 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         'user_id': fields.many2one('res.users', "User"),
         'partner_id' : fields.many2one('res.partner', 'Partner'),
         'address_id' : fields.many2one('res.partner.address', 'Address'),
-        'email_from' : fields.char('From', required=True, size=128),
-        'email_to' : fields.char('To', required=True, size=128),
-        'subject' : fields.char('Subject', required=True, size=128),
-        'message' : fields.text('Message', required=True),
-        'history': fields.selection([('latest', 'Latest email'), ('whole', 'Whole Story'), ('info', 'Case Information')], 'Send history', required=True),
-        'add_cc': fields.boolean('Add as CC', required=False, help="Check this box if you want this address to be added in the CC list"\
-            " for this case, in order to receive all future conversations"),
+        'history': fields.selection([('info', 'Case Information'), ('latest', 'Latest email'), ('whole', 'Whole Story')], 'Send history', required=True),
     }
 
     _defaults = {
         'name' : 'email',
-        'history': 'info',
-        'add_cc': True,
+        'history': 'latest',
         'email_from': lambda self, cr, uid, *a: self.pool.get('res.users')._get_email_from(cr, uid, uid)[uid]
     }
 
@@ -116,7 +110,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         res_id = context.get('active_id')
         msg_val = self._get_case_history(cr, uid, history_type, res_id, context=context)
         if msg_val:
-            res = {'value': {'message' : '\n\n' + msg_val}}
+            res = {'value': {'body' : '\n\n' + msg_val}}
         return res
 
     def _get_case_history(self, cr, uid, history_type, res_id, context=None):
@@ -124,22 +118,24 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             return
 
         msg_val = ''
+        case_info = self.get_lead_details(cr, uid, res_id, context=context)
         model_pool = self.pool.get('crm.lead')
+
         if history_type == 'info':
-            msg_val = self.get_lead_details(cr, uid, res_id, context=context)
+            msg_val = case_info
 
         elif history_type == 'whole':
             log_ids = model_pool.browse(cr, uid, res_id, context=context).message_ids
-            log_ids = [x.id for x in log_ids]
-            if not log_ids:
-                raise osv.except_osv('Warning!', 'There is no history to send')
-            msg_val = self.get_whole_history(cr, uid, log_ids, context=context)
+            log_ids = map(lambda x: x.id, filter(lambda x: x.history, log_ids))
+            msg_val = case_info + '\n\n' + self.get_whole_history(cr, uid, log_ids, context=context)
 
         elif history_type == 'latest':
             log_ids = model_pool.browse(cr, uid, res_id, context=context).message_ids
+            log_ids = filter(lambda x: x.history and x.id, log_ids)
             if not log_ids:
-                raise osv.except_osv('Warning!', 'There is no history to send')
-            msg_val = self.get_latest_history(cr, uid, log_ids[0].id, context=context)
+                msg_val = case_info
+            else:
+                msg_val = case_info + '\n\n' + self.get_latest_history(cr, uid, log_ids[0].id, context=context)
 
         return msg_val
 
@@ -169,72 +165,49 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             email = self.pool.get('res.partner.address').browse(cr, uid, address_id).email
         return {'value': {'email_to' : email}}
 
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {'type' : 'ir.actions.act_window_close'}
-
     def action_forward(self, cr, uid, ids, context=None):
         """
         Forward the lead to a partner
         """
-        if context is None:
-            context = {}
-
-        res_id = context.get('active_id', False)
-
-        model = context.get('active_model', False)
-        if not res_id or not model:
-            return {}
-
+        
         this = self.browse(cr, uid, ids[0], context=context)
-
-        case_pool = self.pool.get(model)
+        case_pool = self.pool.get(context.get('active_model'))
+        res_id = context and context.get('active_id', False) or False
         case = case_pool.browse(cr, uid, res_id, context=context)
 
-        emails = [this.email_to]
-        body = case_pool.format_body(this.message)
-        email_from = this.email_from or False
+        context.update({'mail': 'forward'})
+        super(crm_lead_forward_to_partner, self).action_send(cr, uid, ids, context=context)
 
-        # extract attachements from case and emails according to mode
-        attachments = []
-        attach_pool = self.pool.get('ir.attachment')
-        direct_attachments = attach_pool.search(cr, uid, [('res_model', '=', 'crm.lead'), ('res_id', '=', res_id)], context=context)
-        attachments += attach_pool.browse(cr, uid, direct_attachments, context=context)
-        if this.history in ['latest', 'whole'] and case.message_ids:
-            msgs = case.message_ids
-            if this.history == 'latest':
-                msgs = msgs[:1]
-            attachments.extend(itertools.chain(*[m.attachment_ids for m in msgs]))
-        attach = [(a.datas_fname or a.name, base64.decodestring(a.datas)) for a in attachments if a.datas]
+        to_write = {'date_assign': time.strftime('%Y-%m-%d')}
+        if (this.name == 'partner' and this.partner_id):
+            to_write['partner_assigned_id'] = this.partner_id.id
 
-        result = tools.email_send(
-            email_from,
-            emails,
-            this.subject,
-            body,
-            openobject_id=str(case.id),
-            attach=attach,
-            reply_to=case.section_id.reply_to,
-        )
-
-        if result:
-            case_pool.history(cr, uid, [case], _('Forward'), history=True, email=this.email_to, subject=this.subject, details=body, email_from=email_from, attach=attach)
-        else:
-            raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
-
-        if this.add_cc and (not case.email_cc or not this.email_to in case.email_cc):
-            case_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc + ', ' + this.email_to or this.email_to})
+        if this.name == 'user':
+            to_write.update({'user_id' : this.user_id.id})
+        email_re = r'([^ ,<@]+@[^> ,]+)'
+        email_cc = re.findall(email_re, case.email_cc or '')
+        new_cc = []
+        if case.email_cc:
+            new_cc.append(case.email_cc)
+        for to in this.email_to.split(','):
+            email_to = re.findall(email_re, to)
+            email_to = email_to and email_to[0] or ''
+            if email_to not in email_cc:
+                new_cc.append(to)
+        to_write.update({'email_cc' : ', '.join(new_cc) })
+        case_pool.write(cr, uid, case.id, to_write, context=context)
 
         return {}
 
     def get_lead_details(self, cr, uid, lead_id, context=None):
-        message = []
+        body = []
         lead_proxy = self.pool.get('crm.lead')
         lead = lead_proxy.browse(cr, uid, lead_id, context=context)
-        if not lead.type or lead.type == 'lead':
+        if not lead.type or lead.type == 'lead' or not lead.partner_address_id:
                 field_names = [
-                    'partner_name', 'title', 'function', 'street', 'street2', 
-                    'zip', 'city', 'country_id', 'state_id', 'email_from', 
-                    'phone', 'fax', 'mobile'
+                    'partner_name', 'title', 'function', 'street', 'street2',
+                    'zip', 'city', 'country_id', 'state_id', 'email_from',
+                    'phone', 'fax', 'mobile', 'categ_id', 'description',
                 ]
 
                 for field_name in field_names:
@@ -245,7 +218,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
                         if hasattr(field_definition.selection, '__call__'):
                             key = field_definition.selection(lead_proxy, cr, uid, context=context)
                         else:
-                            key = field.definition.selection
+                            key = field_definition.selection
                         value = dict(key).get(lead[field_name], lead[field_name])
                     elif field_definition._type == 'many2one':
                         if lead[field_name]:
@@ -253,26 +226,28 @@ class crm_lead_forward_to_partner(osv.osv_memory):
                     else:
                         value = lead[field_name]
 
-                    message.append("%s: %s" % (field_definition.string, value or ''))
+                    body.append("%s: %s" % (field_definition.string, value or ''))
         elif lead.type == 'opportunity':
             pa = lead.partner_address_id
-            message = [
-            "Partner: %s" % (lead.partner_id.name_get()[0][1]), 
-            "Contact: %s" % (pa.name or ''), 
-            "Title: %s" % (pa.title or ''), 
-            "Function: %s" % (pa.function and pa.function.name_get()[0][1] or ''), 
-            "Street: %s" % (pa.street or ''), 
-            "Street2: %s" % (pa.street2 or ''), 
-            "Zip: %s" % (pa.zip or ''), 
-            "City: %s" % (pa.city or ''), 
-            "Country: %s" % (pa.country_id and pa.country_id.name_get()[0][1] or ''), 
-            "State: %s" % (pa.state_id and pa.state_id.name_get()[0][1] or ''), 
-            "Email: %s" % (pa.email or ''), 
-            "Phone: %s" % (pa.phone or ''), 
-            "Fax: %s" % (pa.fax or ''), 
-            "Mobile: %s" % (pa.mobile or ''), 
+            body = [
+                "Partner: %s" % (lead.partner_id and lead.partner_id.name_get()[0][1]), 
+                "Contact: %s" % (pa.name or ''), 
+                "Title: %s" % (pa.title or ''), 
+                "Function: %s" % (pa.function or ''), 
+                "Street: %s" % (pa.street or ''), 
+                "Street2: %s" % (pa.street2 or ''), 
+                "Zip: %s" % (pa.zip or ''), 
+                "City: %s" % (pa.city or ''), 
+                "Country: %s" % (pa.country_id and pa.country_id.name_get()[0][1] or ''), 
+                "State: %s" % (pa.state_id and pa.state_id.name_get()[0][1] or ''), 
+                "Email: %s" % (pa.email or ''), 
+                "Phone: %s" % (pa.phone or ''), 
+                "Fax: %s" % (pa.fax or ''), 
+                "Mobile: %s" % (pa.mobile or ''), 
+                "Lead Category: %s" % (lead.categ_id and lead.categ_id.name or ''), 
+                "Details: %s" % (lead.description or ''), 
             ]
-        return "\n".join(message + ['---'])
+        return "\n".join(body + ['---'])
 
     def default_get(self, cr, uid, fields, context=None):
         """
@@ -290,10 +265,10 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         lead_proxy = self.pool.get('crm.lead')
         lead = lead_proxy.browse(cr, uid, active_id, context=context)
 
-        message = self._get_case_history(cr, uid, defaults.get('history', 'latest'), lead.id, context=context)
+        body = self._get_case_history(cr, uid, defaults.get('history', 'latest'), lead.id, context=context)
         defaults.update({
             'subject' : '%s: %s' % (_('Fwd'), lead.name),
-            'message' : message,
+            'body' : body,
         })
         return defaults
 
diff --git a/addons/crm/wizard/crm_forward_to_partner_view.xml b/addons/crm/wizard/crm_forward_to_partner_view.xml
index e8a60cea01f..d2705c8f0db 100644
--- a/addons/crm/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm/wizard/crm_forward_to_partner_view.xml
@@ -5,41 +5,45 @@
             <field name="name">crm_lead_forward_to_partner</field>
             <field name="model">crm.lead.forward.to.partner</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="crm_send_new_mail_view"/>
             <field name="arch" type="xml">
-                <form string="Forward to Partner">
-                    <separator string="Sender" colspan="4" />
-                    <field name="email_from" colspan="2" />
-                    <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
-                    <separator string="Recipient" colspan="4" />
-                    <field name="name" colspan="2" />
-                    <group col="2" colspan="2" attrs="{ 'invisible' : [('name','!=','user')]}">
-                        <field name="user_id"
-                            attrs="{ 'required' : [('name','=','user')]}"
-                            on_change="on_change_email(user_id)" />
+                <field name="email_from" position="before">
+                    <separator string="Forward to Partner" colspan="4" />
+                    <group col="4" colspan="6">
+                        <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
+                        <field name="name" colspan="2" />
+                        <group col="2" colspan="2" attrs="{ 'invisible' : [('name','!=','user')]}">
+                            <field name="user_id"
+                                attrs="{ 'required' : [('name','=','user')]}"
+                                on_change="on_change_email(user_id)" />
+                        </group>
+                        <group col="4" colspan="4" attrs="{'invisible' : [('name','!=','partner')]}">
+                            <field name="partner_id" attrs="{'required' : [('name','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2" />
+                            <field name="address_id" string="Contact" on_change="on_change_address(address_id)" colspan="2" />
+                        </group>
                     </group>
-                    <group col="4" colspan="4" attrs="{'invisible' : [('name','!=','partner')]}">
-                        <field name="partner_id" attrs="{'required' : [('name','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2" />
-                        <field name="address_id" string="Contact" on_change="on_change_address(address_id)" colspan="2" />
-                    </group>
-                    <field colspan="2" name="email_to" attrs="{ 'required' : [('name','=','email')]}" />
-                    <field name="add_cc"/>
-                    <separator string="Message" colspan="4" />
-                    <field name="subject" colspan="4" />
-                    <field name="message" colspan="4" nolabel="1"/>
                     <separator string="" colspan="4" />
-                    <group colspan="4" col="2">
-                        <button name="action_cancel" special="cancel" string="Cancel" icon="gtk-cancel" type="object" />
-                        <button name="action_forward" string="Forward" icon="gtk-go-forward" type="object" />
-                    </group>
-                </form>
+                </field>
             </field>
         </record>
 
+        <record model="ir.ui.view" id="crm_lead_forward_to_partner_form1">
+            <field name="name">crm_lead_forward_to_partner1</field>
+            <field name="model">crm.lead.forward.to.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="crm_send_new_mail_view"/>
+            <field name="arch" type="xml">
+                <button name="action_send" position="replace">
+                    <button name="action_forward" string="Forward" icon="gtk-go-forward" type="object" />
+                </button>
+            </field>
+        </record>
         <record model="ir.actions.act_window" id="crm_lead_forward_to_partner_act">
             <field name="name">Forward to Partner</field>
             <field name="res_model">crm.lead.forward.to.partner</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_lead_forward_to_partner_form1"/>
             <field name="target">new</field>
         </record>
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 7f47e27a4ff..79c833b278c 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -79,6 +79,7 @@ class crm_lead2opportunity(osv.osv_memory):
                 'probability': this.probability,
                 'name': this.name, 
                 'partner_id': this.partner_id.id, 
+                'user_id': (this.partner_id.user_id and this.partner_id.user_id.id) or (lead.user_id and lead.user_id.id), 
                 'type': 'opportunity'
             }
             lead_obj.write(cr, uid, lead.id, vals, context=context)
@@ -126,9 +127,9 @@ class crm_lead2opportunity(osv.osv_memory):
             if lead.state in ['done', 'cancel']:
                 raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
 Leads Could not convert into Opportunity"))
-            if lead.state != 'open':
+            if lead.state not in ('open', 'pending'):
                 raise osv.except_osv(_('Warning !'), _('Lead should be in \
-\'Open\' state before converting to Opportunity.'))
+\'Open\' or \'Pending\' state before converting to Opportunity.'))
         return False
 
     def default_get(self, cr, uid, fields, context=None):
@@ -221,7 +222,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         res = mod_obj.read(cr, uid, result, ['res_id'])
         value = {}
         data_obj = self.pool.get('ir.model.data')
-        data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_create')
+        data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action')
         view_id = False
         if data_id:
             view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
@@ -231,7 +232,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             'name': _('Create Opportunity'), 
             'view_type': 'form', 
             'view_mode': 'form,tree', 
-            'res_model': 'crm.lead2opportunity', 
+            'res_model': 'crm.lead2opportunity.action', 
             'view_id': False, 
             'context': context, 
             'views': [(view_id, 'form')], 
@@ -289,12 +290,75 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             if lead.state in ['done', 'cancel']:
                 raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
 Leads Could not convert into Opportunity"))
-            if lead.state != 'open':
+            if lead.state not in ('open', 'pending'):
                 raise osv.except_osv(_('Warning !'), _('Lead should be in \
-\'Open\' state before converting to Opportunity.'))
+\'Open\' or \'Pending\' state before converting to Opportunity.'))
         return False
 
 crm_lead2opportunity_partner()
 
+class crm_lead2opportunity_action(osv.osv_memory):
+    '''
+    Merge with Existing Opportunity or Convert to Opportunity
+    '''
+    _name = 'crm.lead2opportunity.action'
+    _description = 'Convert/Merge Opportunity'
+    
+    _columns = {
+        'name': fields.selection([('convert', 'Convert to Opportunity'), ('merge', 'Merge with existing Opportunity')],'Select Action', required=True),
+        
+    }
+
+    _defaults = {
+        'name': 'convert',
+        }
+
+    def do_action(self, cr, uid, ids, context=None):
+        """
+        This function opens form according to selected Action
+        @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 Lead to Opportunity IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for Opportunity form
+        """
+        value = {}
+        data_obj = self.pool.get('ir.model.data')
+        view_id = False
+        for this in self.browse(cr, uid, ids, context=context):
+            if this.name == 'convert':
+                data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_create')
+                if data_id:
+                    view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+                value = {
+                        'name': _('Create Opportunity'), 
+                        'view_type': 'form', 
+                        'view_mode': 'form,tree', 
+                        'res_model': 'crm.lead2opportunity', 
+                        'view_id': False, 
+                        'context': context, 
+                        'views': [(view_id, 'form')], 
+                        'type': 'ir.actions.act_window', 
+                        'target': 'new', 
+                    }
+            elif this.name == 'merge':
+                data_id = data_obj._get_id(cr, uid, 'crm', 'merge_opportunity_form')
+                if data_id:
+                    view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+                value = {
+                        'name': _('Merge with Existing Opportunity'), 
+                        'view_type': 'form', 
+                        'view_mode': 'form,tree', 
+                        'res_model': 'crm.merge.opportunity', 
+                        'view_id': False, 
+                        'context': context, 
+                        'views': [(view_id, 'form')], 
+                        'type': 'ir.actions.act_window', 
+                        'target': 'new', 
+                    }
+        return value
+
+crm_lead2opportunity_action()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 25d9017c8cb..d41030789b6 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -3,7 +3,7 @@
 
         <!-- Lead to Opportunity view -->
 
-          <record id="view_crm_lead2opportunity_create" model="ir.ui.view">
+      <record id="view_crm_lead2opportunity_create" model="ir.ui.view">
           <field name="name">crm.lead2opportunity.create</field>
           <field name="model">crm.lead2opportunity</field>
           <field name="type">form</field>
@@ -61,5 +61,25 @@
           </field>
        </record> 
 
+    <record id="view_crm_lead2opportunity_action" model="ir.ui.view">
+          <field name="name">crm.lead2opportunity.action.form</field>
+          <field name="model">crm.lead2opportunity.action</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+               <form string="Select Action">
+               <separator string="Select Action" colspan="4" />
+                <label string="If you select Merge with existing Opportunity, the lead details(with the communication history) will be merged with existing Opportunity of Selected partner." colspan="4"/>
+                <newline/>
+                <field name="name" colspan="4"/>
+                <separator colspan="4" />
+                <group col="4" colspan="4">
+                    <label colspan="2"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="do_action" string="Next" type="object" icon="gtk-go-forward"/>
+                </group>
+            </form>
+          </field>
+       </record> 
+
      </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
new file mode 100644
index 00000000000..82463c29cf9
--- /dev/null
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -0,0 +1,149 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 crm import crm
+from osv import osv, fields
+from tools.translate import _
+
+class crm_merge_opportunity(osv.osv_memory):
+    """Merge two Opportunities"""
+
+    _name = 'crm.merge.opportunity'
+    _description = 'Merge two Opportunities'
+
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @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 fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        """
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            opp_obj = self.pool.get('crm.lead')
+            opp = opp_obj.browse(cr, uid, record_id, context=context)
+            if not opp.partner_id:
+                raise osv.except_osv(_('Warning!'), _('Opportunity must have Partner assigned before merging with other Opportunity.'))
+            #Search for Opportunity for the same partner
+            opp_ids = opp_obj.search(cr, uid, [('partner_id', '=', opp.partner_id.id), ('type', '=', 'opportunity'), ('state', 'in', ('open', 'pending'))])
+            # Removing current opportunity
+            if record_id in opp_ids:
+                opp_ids.remove(record_id)
+            if not opp_ids:
+                raise osv.except_osv(_('Warning!'), _("There are no other 'Open' or 'Pending' Opportunities for the partner '%s'.") % (opp.partner_id.name))
+        pass
+
+
+    def action_merge(self, cr, uid, ids, context=None):
+        """
+        This function merges two opportunities
+        @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 Phonecall to Opportunity IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Opportunity form
+        """
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            opp_obj = self.pool.get('crm.lead')
+            message_obj = self.pool.get('mailgate.message')
+            current_opp = opp_obj.browse(cr, uid, record_id, context=context)
+
+            for this in self.browse(cr, uid, ids, context=context):
+                for opp in this.opportunity_ids:
+                    opp_obj.write(cr, uid, opp.id, {
+                                    'stage_id': opp.stage_id.id or current_opp.stage_id.id or False,
+                                    'priority': opp.priority or current_opp.priority,
+                                    'email_from': opp.email_from or current_opp.email_from,
+                                    'phone': opp.phone or current_opp.phone,
+                                    'section_id': opp.section_id.id or current_opp.section_id.id or False,
+                                    'categ_id': opp.categ_id.id or current_opp.categ_id.id or False,
+                                    'description': (opp.description or '') + '\n' + (current_opp.description or ''),
+                                    'partner_name': opp.partner_name or current_opp.partner_name,
+                                    'title': opp.title.id or current_opp.title.id or False,
+                                    'function': opp.function or current_opp.function,
+                                    'street': opp.street or current_opp.street,
+                                    'street2': opp.street2 or current_opp.street2,
+                                    'zip': opp.zip or current_opp.zip,
+                                    'city': opp.city or current_opp.city,
+                                    'country_id': opp.country_id.id or current_opp.country_id.id or False,
+                                    'state_id': opp.state_id.id or current_opp.state_id.id or False,
+                                    'fax': opp.fax or current_opp.fax,
+                                    'mobile': opp.mobile or current_opp.mobile,
+                                    'email_cc': ','.join(filter(lambda x: x, [opp.email_cc, current_opp.email_cc]))
+                                })
+                    for history in current_opp.message_ids:
+                        if history.history:
+                            new_history = message_obj.copy(cr, uid, history.id, default={'res_id': opp.id})
+                    opp_obj._history(cr, uid, [current_opp], _('Merged into Opportunity: %s') % (opp.id))
+
+            if this.state == 'unchanged':
+                    pass
+            elif this.state == 'done':
+                opp_obj.case_close(cr, uid, [record_id])
+            elif this.state == 'draft':
+                opp_obj.case_reset(cr, uid, [record_id])
+            elif this.state in ['cancel', 'open', 'pending']:
+                act = 'case_' + this.state
+                getattr(opp_obj, act)(cr, uid, [record_id])
+        return {}
+
+    _columns = {
+        'opportunity_ids' : fields.many2many('crm.lead',  'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
+        'state': fields.selection(crm.AVAILABLE_STATES + [('unchanged', 'Unchanged')], string='Set State To', required=True),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @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 fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        record_id = context and context.get('active_id', False) or False
+        res = super(crm_merge_opportunity, self).default_get(cr, uid, fields, context=context)
+
+        if record_id:
+            opp_obj = self.pool.get('crm.lead')
+            opp = opp_obj.browse(cr, uid, record_id, context=context)
+            opp_ids = opp_obj.search(cr, uid, [('partner_id', '=', opp.partner_id.id), ('type', '=', 'opportunity'), ('state', 'in', ('open', 'pending'))])
+            # Removing current opportunity
+            if record_id in opp_ids:
+                opp_ids.remove(record_id)
+
+            if 'opportunity_ids' in fields:
+                res.update({'opportunity_ids': opp_ids})
+            if 'state' in fields:
+                res.update({'state': u'cancel'})
+
+        return res
+
+crm_merge_opportunity()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
new file mode 100644
index 00000000000..5ee0eda5375
--- /dev/null
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- Merge Opportunities  -->
+
+        <record model="ir.ui.view" id="merge_opportunity_form">
+            <field name="name">crm.merge.opportunity.form</field>
+            <field name="model">crm.merge.opportunity</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Merge Opportunities">
+                    <separator string="Select Opportunities" colspan="4"/>
+                    <field name="opportunity_ids" nolabel="1" colspan="4" width="550" height="300"/>
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4">
+                        <field name="state" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_merge" type="object"
+                                string="_Merge" icon="gtk-ok" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <!--  Merge Opportunities action -->
+
+        <record model="ir.actions.act_window" id="merge_opportunity_act">
+            <field name="name">Merge Opportunities</field>
+            <field name="res_model">crm.merge.opportunity</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="merge_opportunity_form"/>
+            <field name="target">new</field>
+        </record>
+
+        <!--    This will also come in Leads Form as Lead and Opportunity are same object-->
+        <!-- <record id="merge_opportunity_act_value" model="ir.values">
+            <field name="model_id" ref="model_crm_lead" />
+            <field name="object" eval="1" />
+            <field name="name">Merge Opportunities</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('merge_opportunity_act'))"/>
+            <field name="key">action</field>
+            <field name="model">crm.lead</field>
+        </record> -->
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index 948d8219ec2..8c40201243c 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -33,6 +33,9 @@ class crm_opportunity2phonecall(osv.osv_memory):
         'user_id' : fields.many2one('res.users', "Assign To"),
         'date': fields.datetime('Date' , required=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', required=True, \
+                        domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.phonecall')]"), 
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -47,6 +50,12 @@ class crm_opportunity2phonecall(osv.osv_memory):
         @return : default values of fields.
         """
         opp_obj = self.pool.get('crm.lead')
+        categ_id = False
+        data_obj = self.pool.get('ir.model.data')
+        res_id = data_obj._get_id(cr, uid, 'crm', 'categ_phone2')
+        if res_id:
+            categ_id = data_obj.browse(cr, uid, res_id, context=context).res_id
+
         record_ids = context and context.get('active_ids', []) or []
         res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
         for opp in opp_obj.browse(cr, uid, record_ids, context=context):
@@ -56,6 +65,8 @@ class crm_opportunity2phonecall(osv.osv_memory):
                 res.update({'user_id': opp.user_id and opp.user_id.id or False})
             if 'section_id' in fields:
                 res.update({'section_id': opp.section_id and opp.section_id.id or False})
+            if 'categ_id' in fields:
+                res.update({'categ_id': categ_id})
         return res
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -90,8 +101,6 @@ class crm_opportunity2phonecall(osv.osv_memory):
         res = mod_obj.read(cr, uid, result, ['res_id'])
 
         data_obj = self.pool.get('ir.model.data')
-        categ_id = mod_obj._get_id(cr, uid, 'crm', 'categ_phone1')
-        categ_id = data_obj.browse(cr, uid, categ_id, context=context).res_id
 
         # Select the view
         id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
@@ -107,10 +116,10 @@ class crm_opportunity2phonecall(osv.osv_memory):
                         'name' : opp.name,
                         'case_id' : opp.id ,
                         'user_id' : this.user_id and this.user_id.id or False,
-                        'categ_id' : categ_id,
+                        'categ_id' : this.categ_id.id,
                         'description' : opp.description or False,
                         'date' : this.date,
-                        'section_id' : opp.section_id and opp.section_id.id or False,
+                        'section_id' : this.section_id.id or opp.section_id.id or False,
                         'partner_id': opp.partner_id and opp.partner_id.id or False,
                         'partner_address_id': opp.partner_address_id and opp.partner_address_id.id or False,
                         'partner_phone' : opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False),
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index da8db534812..4d0cf3129f6 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -17,6 +17,7 @@
                 		<newline/>
 						<field name="user_id" />
 						<field name="section_id"/>
+						<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
 						<separator string="" colspan="4"/>
 						<label string ="" colspan="2"/>
 						<button name="action_cancel" string="_Cancel"
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index c7da406f687..6da8a168b21 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -30,7 +30,7 @@
 	      	<form string="Create a Partner">
 	      		<field name="action"/>
 	      		<group attrs="{'invisible':[('action','!=','exist')]}">
-		            <field name="partner_id"/>
+		            <field name="partner_id" attrs="{'required':[('action','=','exist')]}" />
 		        </group>
 		        <separator string="" colspan="4" />
 	      		<group col="4" colspan="4">
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 83b1959b196..aed957cb305 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -20,17 +20,13 @@
 #
 ##############################################################################
 
+from crm import crm
 from osv import osv, fields
 from tools.translate import _
 import base64
+import itertools
 import tools
-from crm import crm
-
-class crm_send_new_email(osv.osv_memory):
-    """ Sends new email for the case"""
-    _name = "crm.send.mail"
-
-crm_send_new_email()
+import re
 
 class crm_send_new_email_attachment(osv.osv_memory):
     _name = 'crm.send.mail.attachment'
@@ -38,13 +34,12 @@ class crm_send_new_email_attachment(osv.osv_memory):
     _columns = {
         'binary' : fields.binary('Attachment', required=True),
         'name' : fields.char('Name', size=128, required=True),
-
         'wizard_id' : fields.many2one('crm.send.mail', 'Wizard', required=True),
     }
 
 crm_send_new_email_attachment()
 
-class crm_send_new_email2(osv.osv_memory):
+class crm_send_new_email(osv.osv_memory):
     """ Sends new email for the case"""
     _name = "crm.send.mail"
     _description = "Send new email"
@@ -52,33 +47,26 @@ class crm_send_new_email2(osv.osv_memory):
     _columns = {
         'email_to' : fields.char('To', size=512, required=True),
         'email_from' : fields.char('From', size=128, required=True),
-        'email_cc' : fields.char('CC', size=512, help="Carbon Copy: list of recipients that will receive"\
-                                    " a copy of this mail, and future communication related to this case"),
+        'reply_to' : fields.char('Reply To', size=128, required=True, help="Reply-to of the Sales team defined on this case"),
+        'email_cc' : fields.char('CC', size=512, help="These addresses will receive a copy of this email. To modify the permanent CC list, edit the global CC field of this case"),
         'subject': fields.char('Subject', size=512, required=True),
-        'text': fields.text('Message', required=True),
+        'body': fields.text('Message Body', required=True),
         'state': fields.selection(crm.AVAILABLE_STATES, string='Set New State To', required=True),
-
         'attachment_ids' : fields.one2many('crm.send.mail.attachment', 'wizard_id'),
     }
 
-    def action_cancel(self, cr, uid, ids, context=None):
-        """ Closes Phonecall to Opportunity form
-        """
-        return {'type':'ir.actions.act_window_close'}
-
     def action_send(self, cr, uid, ids, context=None):
         """ This sends an email to ALL the addresses of the selected partners.
         """
-
         hist_obj = self.pool.get('mailgate.message')
 
         if not context:
             context = {}
 
-        if not context.get('model'):
+        if not context.get('active_model'):
             raise osv.except_osv(_('Error'), _('Can not send mail!'))
 
-        model = context.get('model')
+        model = context.get('active_model')
         case_pool = self.pool.get(model)
         res_id = context and context.get('active_id', False) or False
 
@@ -90,24 +78,38 @@ class crm_send_new_email2(osv.osv_memory):
             message_id = None
             ref_id = None
 
-            case = case_pool.browse(cr, uid, res_id)
+            case = case_pool.browse(cr, uid, res_id, context=context)
             if context.get('mail', 'new') == 'new':
                 if case.message_ids:
                     message_id = case.message_ids[0].message_id
+            elif context.get('mail') == 'forward':
+                # extract attachements from case and emails according to mode
+                attachments = []
+                attach_pool = self.pool.get('ir.attachment')
+                direct_attachments = attach_pool.search(cr, uid, [('res_model', '=', 'crm.lead'), ('res_id', '=', res_id)], context=context)
+                attachments += attach_pool.browse(cr, uid, direct_attachments, context=context)
+                if obj.history in ['latest', 'whole'] and case.message_ids:
+                    msgs = case.message_ids
+                    if obj.history == 'latest':
+                        msgs = msgs[:1]
+                    attachments.extend(itertools.chain(*[m.attachment_ids for m in msgs]))
+                attach_all = [(a.datas_fname or a.name, base64.decodestring(a.datas)) for a in attachments if a.datas]
+                attach += attach_all
+
             else:
-                hist = hist_obj.browse(cr, uid, res_id)
+                hist = hist_obj.browse(cr, uid, res_id, context=context)
                 message_id = hist.message_id
                 model = hist.model
-                model_pool = self.pool.get(model)
+                case_pool = self.pool.get(model)
                 res_id = hist.res_id
                 ref_id = hist.ref_id
-                case = model_pool.browse(cr, uid, res_id)
+                case = case_pool.browse(cr, uid, res_id, context=context)
             emails = [obj.email_to]
-            email_cc = obj.email_cc and  obj.email_cc.split(',') or ''
+            email_cc = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_cc or '')
             emails = filter(None, emails)
-            body = obj.text
+            body = obj.body
 
-            body = case_pool.format_body(body)
+            body = body and tools.ustr(body) or ''
             email_from = getattr(obj, 'email_from', False)
             x_headers = {}
             if message_id:
@@ -120,29 +122,29 @@ class crm_send_new_email2(osv.osv_memory):
                 body,
                 email_cc=email_cc,
                 attach=attach,
-                reply_to=case.section_id and case.section_id.reply_to,
+                reply_to=obj.reply_to,
                 openobject_id=str(case.id),
                 x_headers=x_headers
             )
 
             if not flag:
                 raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
-            if flag:
-                case_pool.history(cr, uid, [case], _('Send'), history=True, \
-                                email=obj.email_to, details=body, \
-                                subject=obj.subject, email_from=email_from, \
-                                email_cc=email_cc, message_id=message_id, \
-                                references=ref_id or message_id, attach=attach)
-                if obj.state == 'unchanged':
-                    pass
-                elif obj.state == 'done':
-                    case_pool.case_close(cr, uid, [case.id])
-                elif obj.state == 'draft':
-                    case_pool.case_reset(cr, uid, [case.id])
-                elif obj.state in ['cancel', 'open', 'pending']:
-                    act = 'case_' + obj.state
-                    getattr(case_pool, act)(cr, uid, [case.id])
-                cr.commit()
+
+            msg_dict = {'new': 'Send', 'reply': 'Reply', 'forward': 'Forward'}
+            case_pool.history(cr, uid, [case], _(msg_dict[context.get('mail', 'new')]), history=True, \
+                            email=obj.email_to, details=body, \
+                            subject=obj.subject, email_from=email_from, \
+                            email_cc=', '.join(email_cc), message_id=message_id, \
+                            references=ref_id or message_id, attach=attach)
+            if obj.state == 'unchanged':
+                pass
+            elif obj.state == 'done':
+                case_pool.case_close(cr, uid, [case.id])
+            elif obj.state == 'draft':
+                case_pool.case_reset(cr, uid, [case.id])
+            elif obj.state in ['cancel', 'open', 'pending']:
+                act = 'case_' + obj.state
+                getattr(case_pool, act)(cr, uid, [case.id])
 
         return {}
 
@@ -153,16 +155,16 @@ class crm_send_new_email2(osv.osv_memory):
         if not context:
             context = {}
 
-        if not context.get('model'):
+        if not context.get('active_model'):
             raise osv.except_osv(_('Error'), _('Can not send mail!'))
 
-        res = super(crm_send_new_email2, self).default_get(cr, uid, fields, context=context)
+        res = super(crm_send_new_email, self).default_get(cr, uid, fields, context=context)
 
         if context.get('mail') == 'reply':
             res.update(self.get_reply_defaults(cr, uid, fields, context=context))
             return res
 
-        model = context.get('model')
+        model = context.get('active_model')
         mod_obj = self.pool.get(model)
         res_id = context and context.get('active_ids', []) or []
 
@@ -171,15 +173,17 @@ class crm_send_new_email2(osv.osv_memory):
 
         for case in mod_obj.browse(cr, uid, res_id):
             if 'email_to' in fields:
-                res.update({'email_to': tools.ustr(case.email_from)})
+                res.update({'email_to': case.email_from and tools.ustr(case.email_from) or ''})
             if 'email_from' in fields:
-                res.update({'email_from': tools.ustr(user_mail_from)})
+                res.update({'email_from': user_mail_from and tools.ustr(user_mail_from) or ''})
+            if 'reply_to' in fields:
+                res.update({'reply_to': case.section_id and case.section_id.reply_to or False})
             if 'subject' in fields:
                 res.update({'subject': tools.ustr(context.get('subject', case.name) or '')})
             if 'email_cc' in fields:
                 res.update({'email_cc': tools.ustr(case.email_cc or '')})
-            if 'text' in fields:
-                res.update({'text': u'\n'+(tools.ustr(case.user_id.signature or ''))})
+            if 'body' in fields:
+                res.update({'body': u'\n'+(tools.ustr(case.user_id.signature or ''))})
             if 'state' in fields:
                 res.update({'state': u'pending'})
 
@@ -215,7 +219,7 @@ class crm_send_new_email2(osv.osv_memory):
             signature = u'\n' + (tools.ustr(case.user_id.signature or '')) + u'\n'
             original = [signature]
 
-            if include_original == True and 'text' in fields:
+            if include_original == True and 'body' in fields:
                 header = u'-------- Original Message --------'
                 sender = u'From: %s' %(tools.ustr(hist.email_from or ''))
                 to = u'To: %s' % (tools.ustr(hist.email_to or ''))
@@ -224,10 +228,15 @@ class crm_send_new_email2(osv.osv_memory):
 
                 original = [signature, header, sender, to, sentdate, desc]
 
-            res['text']= u'\n' + u'\n'.join(original)
+            res['body']= u'\n' + u'\n'.join(original)
 
             if 'subject' in fields:
                 res.update({u'subject': u'Re: %s' %(tools.ustr(hist.name or ''))})
+            if 'email_cc' in fields:
+                 email_cc = (case.email_cc and tools.ustr(case.email_cc) + ', ' or '') + (hist.email_cc or '')
+                 res.update({'email_cc': email_cc})
+            if 'reply_to' in fields:
+                res.update({'reply_to': case.section_id.reply_to})
             if 'state' in fields:
                 res['state'] = u'pending'
         return res
@@ -245,9 +254,9 @@ class crm_send_new_email2(osv.osv_memory):
         if not context:
             context = {}
 
-        if not context.get('model'):
+        if not context.get('active_model'):
             raise osv.except_osv(_('Error'), _('Can not send mail!'))
         return True
 
-crm_send_new_email2()
+crm_send_new_email()
 
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index 3dfde724bdf..77202a19f6c 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -9,16 +9,17 @@
             <field name="model">crm.send.mail</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Send New Mail" col="4">
+                <form string="Send Mail" col="4">
                     <group colspan="4" col="2">
                     <field name="email_from"/>
+                    <field name="reply_to"/>
                     <field name="email_to" />
                     <field name="email_cc"/>
                     <field name="subject"/>
                     </group>
                     <notebook colspan="6">
                         <page string="Message">
-                            <field name="text" nolabel="1" colspan="4" default_focus="1"/>
+                            <field name="body" nolabel="1" colspan="4" default_focus="1"/>
                         </page>
                         <page string="Attachments">
                             <field name="attachment_ids" colspan="4" nolabel="1">
@@ -35,7 +36,7 @@
                     <separator string="" colspan="6"/>
                     <group colspan="6" col="4" >
                         <field name="state" />
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="action_send" type="object" string="_Send" icon="gtk-go-forward" />
                     </group>
                 </form>
@@ -45,7 +46,7 @@
 <!-- Send New Mail action -->
 
         <record model="ir.actions.act_window" id="action_crm_send_mail">
-            <field name="name">Send New Mail</field>
+            <field name="name">Send Mail</field>
             <field name="res_model">crm.send.mail</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -76,7 +77,7 @@
                         </tree>
                     </field>
                     <separator string="" colspan="4"/>
-                    <field name="text" nolabel="1" colspan="4"/>
+                    <field name="body" nolabel="1" colspan="4"/>
                     <separator string=" " colspan="4"/>
                     <group colspan="4" col="3" >
                         <label string=" " />
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index 0bfb48e328a..ce8f72a3e17 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -28,7 +28,7 @@
     New Futures in Meeting:        
         *  Share meeting with other calendar clients like sunbird         
 """, 
-    'author': 'Tiny', 
+    'author': 'OpenERP SA', 
     'website': 'http://www.openerp.com', 
     'depends': ['caldav', 'crm'
                     ], 
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 8ccd8acd0a4..905b1bba9ff 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -22,12 +22,13 @@
 from osv import fields, osv
 from crm import crm
 import time
+
 class crm_claim(osv.osv, crm.crm_case):
     """
     Crm claim
     """
     _name = "crm.claim"
-    _description = "Claim Cases"
+    _description = "Claim"
     _order = "id desc"
     _inherit = ['mailgate.thread']
     _columns = {
@@ -51,12 +52,6 @@ class crm_claim(osv.osv, crm.crm_case):
                       "canall which is this opportunity source."), 
         'planned_revenue': fields.float('Planned Revenue'), 
         'planned_cost': fields.float('Planned Costs'), 
-        'som': fields.many2one('res.partner.som', 'State of Mind', \
-                        help="The minds states allow to define a value scale "\
-                            "which represents the partner mentality in "\
-                            "relation to our services.The scale has to be "\
-                            "created with a factor for each level from 0 "\
-                            "(Very dissatisfied) to 10 (Extremely satisfied)"), 
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.claim')]"), 
@@ -74,22 +69,19 @@ class crm_claim(osv.osv, crm.crm_case):
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                 # domain="[('partner_id','=',partner_id)]"
                                  ), 
-        'email_cc': fields.text('Watchers Emails', size=252, help="These people will receive a copy of the future communication between partner and users by email"), 
+        'email_cc': fields.text('Watchers Emails', size=252, help="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"), 
         'email_from': fields.char('Email', size=128, help="These people will receive email."), 
         'partner_name': fields.char("Employee's Name", size=64), 
         'partner_mobile': fields.char('Mobile', size=32), 
         'partner_phone': fields.char('Phone', size=32), 
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
-                         domain="[('section_id','=',section_id),\
-                         ('object_id.model', '=', 'crm.claim')]"), 
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage'), 
         'probability': fields.float('Probability (%)'), 
         'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
-        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }
 
     _defaults = {
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 14754ff7857..3e853936541 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -16,6 +16,7 @@
             <field name="view_id" ref="crm_case_claims_tree_view"/>
             <field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
+            <field name="help">Record and trace your customers' claims here. A claim is defined by a client name, several types, a status and a priority level. A  claim can also be a preventive or repairing action. A claim can be linked to a reference like a sales order, or a lot. You can send emails with attachments and get the history of the claim treatment (emails send, interventions type, etc.). </field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 75defcf3d88..3878400e40d 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -47,7 +47,7 @@
         </record>
 
          <menuitem action="crm_claim_resource_act" name="Resource Type"
-                id="menu_crm_claim_stage_act"
+                id="menu_crm_claim_type_act"
                 parent="menu_config_claim" />
 
         <!-- Claims    -->
@@ -57,7 +57,7 @@
             <field name="model">crm.claim</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Claims" colors="blue:state=='pending';black:state=='open';grey:state in ('close', 'cancel')">
+                <tree string="Claims" colors="blue:state=='pending';black:state=='open';gray:state in ('close', 'cancel')">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id" />
@@ -67,7 +67,6 @@
                     <field name="date_closed" string="Closure Date"/>
                     <field name="categ_id" string="Type" select="1"/>
                     <field name="stage_id" invisible="1"/>
-                    <field name="som" invisible="1"/>
                     <field name="state"/>
                     <button name="case_open" string="Open"
                         states="draft,pending" type="object"
@@ -125,7 +124,9 @@
                                     <field name="section_id" widget="selection"/>
                                     <label string="Stage: " align="1.0"/>
                                     <group colspan="1" col="3">
-                                        <field name="stage_id" select="1" nolabel="1"/>
+                                        <field name="stage_id" nolabel="1"
+                                            on_change="onchange_stage_id(stage_id)"
+                                            domain="[('section_id','=',section_id), ('object_id.model', '=', 'crm.claim')]" />
                                         <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
                                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                                     </group>
@@ -162,16 +163,26 @@
                                     type="object" icon="gtk-convert" />
                                 </group>
                             </page>
-                            <page string="Emails" groups="base.group_extended">
+                            <page string="History" groups="base.group_extended">
                                 <group colspan="4">
-                                    <field colspan="4" name="email_cc" string="CC"/>
+                                    <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                                 </group>
-                                <field name="message_ids" colspan="4" nolabel="1" mode="form,tree" height="280">
+                                <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                                    <tree string="Communication history">
+                                        <field name="display_text" string="History Information"/>
+                                        <button
+                                            string="Reply"
+                                            name="%(crm.action_crm_send_mail)d"
+                                            context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True}"
+                                            icon="terp-mail-replied" type="action" />
+                                    </tree>
                                     <form string="Communication history">
-                                        <group col="6" colspan="4">
-                                            <field name="date"/>
-                                            <field name="email_to"/>
+                                        <group col="4" colspan="4">
                                             <field name="email_from"/>
+                                            <field name="date"/>
+                                            <field name="email_to" widget="char" size="512"/>
+                                            <field name="email_cc" widget="char" size="512"/>
+                                            <field name="name" colspan="4" widget="char" size="512"/>
                                         </group>
                                         <notebook colspan="4">
                                             <page string="Details">
@@ -182,44 +193,24 @@
                                             </page>
                                         </notebook>
                                         <button colspan="4"
-                                        string="Reply to Last Email"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'crm.lead'}"
-                                        icon="terp-mail-replied" type="action" />
+                                            string="Reply"
+                                            name="%(crm.action_crm_send_mail)d"
+                                            context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True}"
+                                            icon="terp-mail-replied" type="action" />
                                     </form>
-                                    <tree string="Communication history">
-                                        <field name="date"/>
-                                        <field name="email_from" />
-                                        <field name="email_to"/>
-                                        <field name="description"/>
-                                    </tree>
                                 </field>
                                 <button colspan="4" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.claim'}"
                                 icon="terp-mail-message-new" type="action" />
                             </page>
-                            <page string="History" groups="base.group_extended">
+                            <page string="Extra Info" groups="base.group_extended">
                                 <field name="id" select="1"/>
                                 <field name="active"/>
                                 <field name="canal_id"/>
-                                <field name="som"/>
                                 <separator colspan="4" string="Dates"/>
                                 <field name="create_date"/>
                                 <field name="date_closed"/>
-                                <field name="log_ids" nolabel="1" colspan="4">
-                                    <tree string="Logs">
-                                        <field name="name" colspan="4"/>
-                                        <field name="date"/>
-                                        <field name="user_id"/>
-                                    </tree>
-                                    <form string="Logs">
-                                        <separator string="Action Information" colspan="4"/>
-                                        <field name="name" colspan="4"/>
-                                        <field name="date"/>
-                                        <field name="user_id"/>
-                                    </form>
-                                </field>
                             </page>
                         </notebook>
                     </group>
@@ -319,10 +310,6 @@
                        <filter string="Closure" icon="terp-go-month"
                            domain="[]" help="Date Closed"
                            context="{'group_by':'date_closed'}" />
-                       <separator orientation="vertical"/>
-                        <filter string="State of Mind"
-                            icon="terp-face-plain"
-                            domain="[]" context="{'group_by':'som'}" />
                    </group>
                </search>
            </field>
diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index 18c6d16ed53..fed4026aa02 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -107,7 +107,7 @@ class crm_claim_report(osv.osv):
                 group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), \
                         c.state, c.user_id,c.section_id, c.stage_id,\
                         c.categ_id,c.partner_id,c.company_id,c.create_date,to_char(c.create_date, 'YYYY-MM-DD')
-                        ,c.priority,c.type_id,c.som
+                        ,c.priority,c.type_id
             )""")
 
 crm_claim_report()
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index f10f403c034..37fd3ec015a 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -162,12 +162,12 @@
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
                    <newline/>
-                   <group  expand="0" string="Extended options..." groups="base.group_extended">
+                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
                          <filter icon="terp-dialog-close"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
 
-                    	<filter icon="terp-gtk-stop"
+                    	<filter icon="gtk-cancel"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
 
@@ -211,7 +211,7 @@
             <field name="act_window_id" ref="action_report_crm_claim"/>
         </record>
 
-       <menuitem name="Claims" id="menu_report_crm_claim_tree"
+       <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree"
            groups="base.group_extended"
            action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
 
diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py
index 5c0c7907c3d..0d7e8d656bb 100644
--- a/addons/crm_fundraising/__openerp__.py
+++ b/addons/crm_fundraising/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0', 
     'category': 'Generic Modules/CRM & SRM', 
     'description': """Fundraising""", 
-    'author': 'Tiny', 
+    'author': 'OpenERP SA', 
     'website': 'http://www.openerp.com', 
     'depends': ['crm'], 
     'init_xml': [
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 2fd7f4c6f52..962fae07fd3 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -26,7 +26,7 @@ class crm_fundraising(osv.osv, crm.crm_case):
     """ Fund Raising Cases """
 
     _name = "crm.fundraising"
-    _description = "Fund Raising Cases"
+    _description = "Fund Raising"
     _order = "id desc"
     _inherit = ['mailgate.thread']
     _columns = {
@@ -46,7 +46,7 @@ class crm_fundraising(osv.osv, crm.crm_case):
             'partner_id': fields.many2one('res.partner', 'Partner'), 
             'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"), 
-            'email_cc': fields.text('Watchers Emails', size=252 , help="These people will receive a copy of the future communication between partner and users by email"), 
+            'email_cc': fields.text('Watchers Emails', size=252 , help="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"), 
             'email_from': fields.char('Email', size=128, help="These people will receive email."), 
             'date_closed': fields.datetime('Closed', readonly=True), 
             'date': fields.datetime('Date'), 
@@ -75,18 +75,12 @@ class crm_fundraising(osv.osv, crm.crm_case):
                         "modes available with the customer." \
                        " With each commercial opportunity, you can indicate\
                      the canall which is this opportunity source."), 
-            'som': fields.many2one('res.partner.som', 'State of Mind', \
-                         help="The minds states allow to define a value scale which represents" \
-                              "the partner mentality in relation to our services.The scale has" \
-                            "to be created with a factor for each level from 0 \
-                             (Very dissatisfied) to 10 (Extremely satisfied)."), 
             'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
-            'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
-            'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+            'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         }
 
     _defaults = {
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index 440f1cd29b8..3c97e662d30 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -15,6 +15,7 @@
         <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
         <field name="context">{"search_default_user_id":uid,"search_default_current":1}</field>
         <field name="search_view_id" ref="crm_fundraising.view_crm_case_fund_filter"/>
+        <field name="help">When you wish to support your organization or a campaign, trace here all your activities for collecting money. The menu open a search list where you can find funds description, email, history, probability of success. Several actions buttons allows you to easily modify your different fund status.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 22a437e4142..f6ac9d22c2a 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -154,16 +154,26 @@
                                     type="object" icon="gtk-convert" />
                             </group>
                         </page>
-                        <page string="Emails" groups="base.group_extended">
+                        <page string="History" groups="base.group_extended">
                             <group colspan="4">
-                                <field colspan="4" name="email_cc" string="CC"/>
+                                <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                                <tree string="Communication history">
+                                    <field name="display_text" string="History Information"/>
+                                    <button
+                                        string="Reply"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True}"
+                                        icon="terp-mail-replied" type="action" />
+                                </tree>
                                 <form string="Communication history">
-                                    <group col="6" colspan="4">
-                                        <field name="date"/>
-                                        <field name="email_to"/>
+                                    <group col="4" colspan="4">
                                         <field name="email_from"/>
+                                        <field name="date"/>
+                                        <field name="email_to" widget="char" size="512"/>
+                                        <field name="email_cc" widget="char" size="512"/>
+                                        <field name="name" colspan="4" widget="char" size="512"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
@@ -174,31 +184,24 @@
                                         </page>
                                     </notebook>
                                     <button colspan="4"
-                                    string="Reply to Last Email"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'crm.fundraising'}"
-                                    icon="gtk-undo" type="action" />
+                                        string="Reply"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True}"
+                                        icon="terp-mail-replied" type="action" />
                                 </form>
-                                <tree string="Communication history">
-                                    <field name="date"/>
-                                    <field name="email_from" />
-                                    <field name="email_to"/>
-                                    <field name="description"/>
-                                </tree>
                             </field>
                             <button colspan="4" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.fundraising'}"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-message-new" type="action" />
                         </page>
-                        <page string="History" groups="base.group_extended">
+                        <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Misc"/>
                                 <field name="active"/>
                                 <field name="id" select="1"/>
                                 <field name="priority" string="Priority"/>
                                 <field name="canal_id"/>
-                                <field name="som"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Dates"/>
@@ -212,19 +215,6 @@
                                 <field colspan="4" name="ref"/>
                                 <field colspan="4" name="ref2"/>
                             </group>
-                            <field name="log_ids" nolabel="1" colspan="4">
-                                <tree string="Logs">
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </tree>
-                                <form string="Logs">
-                                    <separator string="Action Information" colspan="4"/>
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </form>
-                            </field>
                         </page>
                     </notebook>
                 </form>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 4a5e05b28e1..a0fd2e35583 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.fundraising.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Fundraising">
+            	<tree colors="blue:state in ('draft');black:state in ('open','pending');gray:state in ('done','cancel') " string="Fundraising">
 	              	<field name="name" invisible="1"/>
 					<field name="month" invisible="1"/>
 					<field name="section_id" invisible="1"/>
@@ -153,12 +153,12 @@
 
                   </group>
                    <newline/>
-                   <group  expand="0" string="Extended options..." groups="base.group_extended">
+                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
                          <filter icon="terp-dialog-close"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
 
-                    	<filter icon="terp-gtk-stop"
+                    	<filter icon="gtk-cancel"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
 
@@ -181,10 +181,10 @@
             <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_fundraising_tree"/>
             <field name="search_view_id" ref="view_report_crm_fundraising_filter"/>
+            <field name="help">With Fund Raising get at a glance a view to your fund raising campaigns with the estimated revenue, average probability and delay to close.</field>
         </record>
 
-
-           <record model="ir.actions.act_window.view" id="action_report_crm_fundrising_tree">
+        <record model="ir.actions.act_window.view" id="action_report_crm_fundrising_tree">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_report_crm_fundraising_tree"/>
@@ -198,7 +198,7 @@
             <field name="act_window_id" ref="action_report_crm_fundraising"/>
         </record>
 
-        <menuitem name="Fundraising"
+        <menuitem name="Fundraising Analysis"
             action="action_report_crm_fundraising"
             groups="base.group_extended"
             id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="20"/>
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index b8d2409fcb2..0f663377476 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0', 
     'category': 'Generic Modules/CRM & SRM', 
     'description': """Helpdesk Management""", 
-    'author': 'Tiny', 
+    'author': 'OpenERP SA', 
     'website': 'http://www.openerp.com', 
     'depends': ['crm'], 
     'init_xml': [
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 38352691db0..9c223c74a54 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -27,7 +27,7 @@ class crm_helpdesk(osv.osv, crm.crm_case):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"
-    _description = "Helpdesk Cases"
+    _description = "Helpdesk"
     _order = "id desc"
     _inherit = ['mailgate.thread']
     _columns = {
@@ -49,9 +49,7 @@ class crm_helpdesk(osv.osv, crm.crm_case):
             'partner_id': fields.many2one('res.partner', 'Partner'), 
             'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"), 
-            'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
- will receive a copy of the future" \
-" communication between partner and users by email"), 
+            'email_cc': fields.text('Watchers Emails', size=252 , help="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"), 
             'email_from': fields.char('Email', size=128, help="These people will receive email."), 
             'date': fields.datetime('Date'), 
             'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 
@@ -63,11 +61,6 @@ class crm_helpdesk(osv.osv, crm.crm_case):
             'planned_cost': fields.float('Planned Costs'), 
             'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
             'probability': fields.float('Probability (%)'), 
-            'som': fields.many2one('res.partner.som', 'State of Mind', \
-                            help="The minds states allow to define a value scale which represents" \
-                                "the partner mentality in relation to our services.The scale has" \
-                                "to be created with a factor for each level from 0" \
-                                "(Very dissatisfied) to 10 (Extremely satisfied)."), 
             'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.helpdesk')]"), 
@@ -77,8 +70,7 @@ class crm_helpdesk(osv.osv, crm.crm_case):
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
-            'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
-            'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+            'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }
 
     _defaults = {
diff --git a/addons/crm_helpdesk/crm_helpdesk_demo.xml b/addons/crm_helpdesk/crm_helpdesk_demo.xml
index fd31bb4c8fb..be8da99f140 100644
--- a/addons/crm_helpdesk/crm_helpdesk_demo.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_demo.xml
@@ -3,7 +3,6 @@
     <data noupdate="1">
         <record id="crm_helpdesk_wheretodownloadopenerp0" model="crm.helpdesk">
             <field model="res.partner.canal" name="canal_id" search="[('name', '=', u'E-mail')]"/>
-            <field name="som" ref="base.som_normal"/>
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="base.main_company"/>
@@ -17,7 +16,6 @@
 
         <record id="crm_helpdesk_cannotabletoconnecttoserver0" model="crm.helpdesk">
             <field model="res.partner.canal" name="canal_id" search="[('name', '=', u'website')]"/>
-            <field name="som" ref="base.som_fury"/>
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="company_id" ref="base.main_company"/>
@@ -31,7 +29,6 @@
 
         <record id="crm_helpdesk_documentationforcrm0" model="crm.helpdesk">
             <field model="res.partner.canal" name="canal_id" search="[('name', '=', u'phone')]"/>
-            <field name="som" ref="base.som_happy"/>
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="base.main_company"/>
@@ -46,7 +43,6 @@
         <record id="crm_helpdesk_howtocreateanewmodule0" model="crm.helpdesk">
             <field model="res.partner.canal" name="canal_id" search="[('name', '=', u'E-mail')]"/>
             <field name="partner_address_id" ref="base.res_partner_address_9"/>
-            <field name="som" ref="base.som_normal"/>
             <field eval="1" name="active"/>
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="user_id" ref="base.user_root"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 8ac1cb7df4b..30267e7b4f2 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -13,6 +13,7 @@
         <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
+        <field name="help">Alike records and processing of claims, Helpdesk and Support is a good tool to trace your interventions. This menu is more adapted to an oral communication, which is not necessarily related to a claim. Select a customer, add notes and categorize your interventions with a channel and a priority level.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index f91da940991..0fe887bab6f 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -36,7 +36,6 @@
                             states="open,pending"
                             string="Send Reminder" type="object"
                             icon="gtk-go-forward" />
-                        <field name="som"/>
                         <field name="date" select="1"/>
                         <field name="date_deadline"/>
                     </group>
@@ -92,16 +91,26 @@
                                     icon="gtk-convert" />
                             </group>
                         </page>
-                        <page string="Emails" groups="base.group_extended">
+                        <page string="History" groups="base.group_extended">
                             <group colspan="4">
-                                <field colspan="4" name="email_cc" string="CC"/>
+                                <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                                <tree string="Communication history">
+                                    <field name="display_text" string="History Information"/>
+                                    <button
+                                        string="Reply"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True}"
+                                        icon="terp-mail-replied" type="action" />
+                                </tree>
                                 <form string="Communication history">
-                                    <group col="6" colspan="4">
-                                        <field name="date"/>
-                                        <field name="email_to"/>
+                                    <group col="4" colspan="4">
                                         <field name="email_from"/>
+                                        <field name="date"/>
+                                        <field name="email_to" widget="char" size="512"/>
+                                        <field name="email_cc" widget="char" size="512"/>
+                                        <field name="name" colspan="4" widget="char" size="512"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
@@ -112,24 +121,18 @@
                                         </page>
                                     </notebook>
                                     <button colspan="4"
-                                    string="Reply to Last Email"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'crm.helpdesk'}"
-                                    icon="gtk-undo" type="action" />
+                                        string="Reply"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True}"
+                                        icon="terp-mail-replied" type="action" />
                                 </form>
-                                <tree string="Communication history">
-                                    <field name="date"/>
-                                    <field name="email_from" />
-                                    <field name="email_to"/>
-                                    <field name="description"/>
-                                </tree>
                             </field>
                             <button colspan="4" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.helpdesk'}"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-message-new" type="action" />
                         </page>
-                        <page string="History" groups="base.group_extended">
+                        <page string="Extra Info" groups="base.group_extended">
                             <group colspan="2" col="2">
                                 <separator colspan="4" string="Dates"/>
                                 <field name="create_date"/>
@@ -150,19 +153,6 @@
                                 <field colspan="4" name="ref"/>
                                 <field colspan="4" name="ref2"/>
                             </group>
-                            <field colspan="4" name="log_ids" nolabel="1">
-                                <tree string="Logs">
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </tree>
-                                <form string="Logs">
-                                    <separator string="Action Information" colspan="4"/>
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </form>
-                            </field>
                         </page>
                     </notebook>
                 </form>
@@ -177,7 +167,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Helpdesk Support Tree"
-                    colors="black:state=='open';blue:state=='pending';grey:state in ('cancel','close')">
+                    colors="black:state=='open';blue:state=='pending';gray:state in ('cancel','close')">
                     <field name="name" string="Query" />
                     <field name="partner_id" string="Partner"/>
                     <field name="date" string="Date"/>
@@ -185,7 +175,6 @@
                     <field name="user_id"/>
                     <field name="section_id"/>
                     <field name="priority"/>
-                    <field name="som" invisible="1"/>
                     <field name="state"/>
                     <button name="case_open" string="Open"
                         states="draft,pending" type="object"
@@ -268,9 +257,6 @@
                             context="{'group_by':'state'}" />
                         <filter string="Priority" icon="terp-rating-rated"
                             domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="State of Mind"
-                            icon="terp-face-plain"
-                            domain="[]" context="{'group_by':'som'}" />
                         <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month"
                            domain="[]" help="Request Date"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 1ebdb041a9a..2544a506fd5 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.helpdesk.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-               <tree string="Helpdesk">
+               <tree colors="blue:state in ('draft');black:state in ('open','pending');gray:state in ('done','cancel') " string="Helpdesk">
                     <field name="name" />
                     <field name="month"/>
                     <field name="section_id" />
@@ -144,7 +144,7 @@
 
                   </group>
                     <newline/>
-                   <group expand="0" string="Extended options..."  groups="base.group_extended">
+                   <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                         <filter string="Priority" icon="terp-rating-rated"
                             domain="[]" context="{'group_by':'priority'}" />
                    </group>
@@ -163,6 +163,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_crm_helpdesk_tree"/>
             <field name="search_view_id" ref="view_report_crm_helpdesk_filter"/>
+            <field name="help">Helpdesk allows you to consult different informations relative to support demands. Check for treatments delays, number of responses given and emails send and costs. You can sort out your analysis on different groups to get fine grained analysis.</field>
         </record>
 
            <record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_tree">
@@ -179,7 +180,7 @@
             <field name="act_window_id" ref="action_report_crm_helpdesk"/>
         </record>
 
-        <menuitem name="Helpdesk" action="action_report_crm_helpdesk"
+        <menuitem name="Helpdesk Analysis" action="action_report_crm_helpdesk"
             groups="base.group_extended"
             id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" sequence="7"/>
 
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index b155e806e0f..191bb32cfd7 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -35,7 +35,7 @@
 
     * Note: this module is not compatible with the module segmentation, since it's the same which has been renamed.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'crm'],
     'init_xml': [],
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index eeb95d77fc1..e0dbcce05a1 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -16,7 +16,7 @@
           <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem parent="base.menu_crm_config_sales" id="menu_segm_questionnaire"
+        <menuitem parent="base.menu_crm_config_lead" id="menu_segm_questionnaire"
                   action="open_questionnaires" />
 
         <record model="ir.actions.act_window" id="open_questions">
@@ -26,7 +26,7 @@
           <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem parent="base.menu_crm_config_sales" id="menu_segm_answer"
+        <menuitem parent="base.menu_crm_config_lead" id="menu_segm_answer"
                   action="open_questions" />
 
 <!-- Profiling Questionnaire Tree view  -->
diff --git a/addons/crm_profiling/i18n/zh_CN.po b/addons/crm_profiling/i18n/zh_CN.po
index f682a32eda1..dd0fe397328 100644
--- a/addons/crm_profiling/i18n/zh_CN.po
+++ b/addons/crm_profiling/i18n/zh_CN.po
@@ -7,58 +7,58 @@ 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"
-"PO-Revision-Date: 2010-01-10 01:56+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-07-19 19:55+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-06-22 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
 #: field:crm_profiling.question,name:0
 #: model:ir.model,name:crm_profiling.model_crm_profiling_question
 msgid "Question"
-msgstr ""
+msgstr "问题"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,init,open:0
 msgid "Open Questionnaire"
-msgstr ""
+msgstr "待处理调查问卷"
 
 #. module: crm_profiling
 #: field:crm.segmentation,child_ids:0
 msgid "Child Profiles"
-msgstr ""
+msgstr "子配置"
 
 #. module: crm_profiling
 #: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
 msgid "crm_profiling management"
-msgstr ""
+msgstr "crm配置管理"
 
 #. module: crm_profiling
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义中输入的对象名称错误"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
 #: model:ir.model,name:crm_profiling.model_crm_profiling_answer
 msgid "Answer"
-msgstr ""
+msgstr "答案"
 
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Profiling"
-msgstr ""
+msgstr "配置中"
 
 #. module: crm_profiling
 #: field:crm_profiling.questionnaire,description:0
@@ -68,71 +68,73 @@ msgstr "说明"
 #. module: crm_profiling
 #: field:crm.segmentation,answer_no:0
 msgid "Excluded Answers"
-msgstr ""
+msgstr "排除的答案"
 
 #. module: crm_profiling
 #: view:crm_profiling.answer:0
 #: view:crm_profiling.question:0
 #: field:res.partner,answers_ids:0
 msgid "Answers"
-msgstr ""
+msgstr "答案"
 
 #. module: crm_profiling
 #: wizard_field:open_questionnaire,init,questionnaire_name:0
 msgid "Questionnaire name"
-msgstr ""
+msgstr "调查问卷名称"
 
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Use a questionnaire"
-msgstr ""
+msgstr "使用的调查问卷"
 
 #. module: crm_profiling
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件!"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
 #: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
 #: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
 msgid "Questionnaires"
-msgstr ""
+msgstr "调查问卷"
 
 #. module: crm_profiling
+#: code:addons/crm_profiling/crm_profiling.py:0
 #: field:crm_profiling.questionnaire,name:0
 #: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
 #: wizard_view:open_questionnaire,init:0
+#, python-format
 msgid "Questionnaire"
-msgstr ""
+msgstr "调查问卷"
 
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "错误! 你不能创建递归的配置"
 
 #. module: crm_profiling
 #: field:crm.segmentation,profiling_active:0
 msgid "Use The Profiling Rules"
-msgstr ""
+msgstr "使用这配置规则"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
 #: field:crm_profiling.question,answers_ids:0
 msgid "Avalaible answers"
-msgstr ""
+msgstr "可用答案"
 
 #. module: crm_profiling
 #: field:crm.segmentation,answer_yes:0
 msgid "Included Answers"
-msgstr ""
+msgstr "包括答案"
 
 #. module: crm_profiling
 #: help:crm.segmentation,profiling_active:0
 msgid ""
 "Check this box if you want to use this tab as part of the segmentation rule. "
 "If not checked, the criteria beneath will be ignored"
-msgstr ""
+msgstr "勾选此项, 如果你想使用这tab做为细分规则的一部分,  如果不选下面的标准将被忽略"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -140,30 +142,30 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm_profiling.open_questions
 #: model:ir.ui.menu,name:crm_profiling.menu_segm_answer
 msgid "Questions"
-msgstr ""
+msgstr "问题"
 
 #. module: crm_profiling
 #: field:crm.segmentation,parent_id:0
 msgid "Parent Profile"
-msgstr ""
+msgstr "上级配置"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,init,end:0
 #: wizard_button:open_questionnaire,open,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: crm_profiling
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "业务伙伴分类"
+msgstr "业务伙伴细分"
 
 #. module: crm_profiling
 #: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
 msgid "Using a questionnaire"
-msgstr ""
+msgstr "使用一调查问卷"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,open,compute:0
 msgid "Save Data"
-msgstr ""
+msgstr "保存日期"
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index 113f2be8883..11c6d3b5d8f 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -27,7 +27,7 @@ of usage: accounting, sales, purchases, ...
 
 The decimal precision is configured per company.
 """,
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "version": "0.1",
     "depends": ["base"],
     "category" : "Generic Modules/Others",
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index b5def0592c6..191677292f0 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -29,14 +29,14 @@
      When creating invoices from picking, Open ERP is able to add and compute the shipping line.
 
      """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['sale', 'purchase', 'stock'],
     'init_xml': ['delivery_data.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
         'wizard/delivery_sale_order_view.xml',
         'delivery_report.xml',
-        'delivery_view.xml',        
+        'delivery_view.xml',
         'partner_view.xml'
     ],
     'demo_xml': ['delivery_demo.xml'],
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index cc5ce326204..704442c778e 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -141,6 +141,8 @@
             <field name="arch" type="xml">
                 <field name="address_id" position="after">
                     <field name="carrier_id"/>
+                    <field name="carrier_tracking_ref" groups="base.group_extended"/>
+                    <field name="number_of_packages" groups="base.group_extended"/>
                     <field name="weight"/>
                 </field>
             </field>
@@ -178,6 +180,8 @@
             <field name="arch" type="xml">
                 <field name="address_id" position="after">
                     <field name="carrier_id"/>
+                    <field name="carrier_tracking_ref" groups="base.group_extended"/>
+                    <field name="number_of_packages" groups="base.group_extended"/>
                     <field name="weight"/>
                 </field>
             </field>
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index 8d0e8a2b38c..173ecac2d64 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:47+0000\n"
+"PO-Revision-Date: 2010-07-20 03:54+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-06-22 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -45,7 +45,7 @@ msgstr "邮递送货"
 #. module: delivery
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: delivery
 #: constraint:res.partner:0
@@ -60,17 +60,17 @@ msgstr "状态"
 #. module: delivery
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from packing."
-msgstr "这送货方式将用在包装的发票上"
+msgstr "这交货方式将用在包装的发票上"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
 msgid "Delivery Grid"
-msgstr "送货网"
+msgstr "交货表格"
 
 #. module: delivery
 #: field:delivery.grid,zip_from:0
@@ -85,13 +85,13 @@ msgstr "固定的"
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
-msgstr "网格明细"
+msgstr "表格行"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
 msgid "Delivery Pricelist"
-msgstr "送货价格表"
+msgstr "交货价格表"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree5
@@ -102,38 +102,38 @@ msgstr "在接收产生发票草稿"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery line of grid"
-msgstr "运费表格行"
+msgstr "交货表格行"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
 msgid "Delivery"
-msgstr "送货"
+msgstr "交货"
 
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr "网格明细"
+msgstr "表格行"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
 msgid "Grid"
-msgstr "网格"
+msgstr "表格"
 
 #. module: delivery
 #: view:res.partner:0
 msgid "Deliveries Properties"
-msgstr "送货属性"
+msgstr "交货属性"
 
 #. module: delivery
 #: field:delivery.carrier,active:0
 #: field:delivery.grid,active:0
 msgid "Active"
-msgstr "现用"
+msgstr "有效"
 
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Grid definition"
-msgstr "网格定义"
+msgstr "表格定义"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -149,7 +149,7 @@ msgstr "="
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr "产品送货"
+msgstr "产品交货"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -159,7 +159,7 @@ msgstr "条件"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_carrier
 msgid "Carrier and delivery grids"
-msgstr "货运公司和运费表格"
+msgstr "货运公司和交货表格"
 
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
@@ -206,7 +206,7 @@ msgstr "可变的"
 #. module: delivery
 #: field:delivery.grid,name:0
 msgid "Grid Name"
-msgstr "运费表格名称"
+msgstr "表格名"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -231,7 +231,7 @@ msgstr "最大值"
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,delivery:0
 msgid "Add Delivery Costs"
-msgstr "增加送货成本"
+msgstr "增加交货成本"
 
 #. module: delivery
 #: wizard_field:delivery.sale.order,init,carrier_id:0
@@ -239,12 +239,12 @@ msgstr "增加送货成本"
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
 #: field:res.partner,property_delivery_carrier:0
 msgid "Delivery Method"
-msgstr "送货方式"
+msgstr "交货方式"
 
 #. module: delivery
 #: field:sale.order,id:0
 msgid "ID"
-msgstr "标识符"
+msgstr "ID"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -254,12 +254,12 @@ msgstr "运算符"
 #. module: delivery
 #: model:ir.module.module,shortdesc:delivery.module_meta_information
 msgid "Carriers and deliveries"
-msgstr "运输公司和送货"
+msgstr "运输公司和交货"
 
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
 msgid "Delivery Grids"
-msgstr "送货网"
+msgstr "交货表格"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -284,7 +284,7 @@ msgid ""
 "Allows you to add delivery methods in sales orders and packing. You can "
 "define your own carrier and delivery grids for prices. When creating "
 "invoices from picking, Open ERP is able to add and compute the shipping line."
-msgstr "允许你在销售单和包装中增加送货方式.你能定义自己的运输公司和送货网的价格.当创建领料/提货发票时,系统可以增加和计算运输明细"
+msgstr "允许你在销售单和包装中增加交货方式. 你能定义自己的运输公司和交货表格的价格. 当创建包装发票时, 系统可以增加和计算运输明细"
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
@@ -301,12 +301,12 @@ msgstr "包装要开发票"
 #: help:sale.order,carrier_id:0
 msgid ""
 "Complete this field if you plan to invoice the shipping based on packing."
-msgstr "如果你计划基于包装开运输发票请完整填写这字段"
+msgstr "如果你计划根据运输这包装开发票请完整填写这字段"
 
 #. module: delivery
 #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
 msgid "Delivery Costs"
-msgstr "送货成本"
+msgstr "交货成本"
 
 #. module: delivery
 #: field:delivery.grid.line,list_price:0
@@ -321,7 +321,7 @@ msgstr "错误:无效EAN编码"
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Delivery grids"
-msgstr "运费表格"
+msgstr "交货表格"
 
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,end:0
@@ -331,7 +331,7 @@ msgstr "取消"
 #. module: delivery
 #: field:sale.order,carrier_id:0
 msgid "Delivery method"
-msgstr "送货方式"
+msgstr "交货方式"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index 79a44933935..5089d261fe3 100644
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.rml
@@ -114,7 +114,7 @@
     <blockTable colWidths="287.0,254.0" repeatRows="1" style="Tableau1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Invoiced to</para>
+          <para style="terp_default_Bold_9">[[ o.sale_id and o.sale_id.partner_invoice_id and 'Invoiced to' or '' ]]</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.partner_id.name or '']]</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']]</para>
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street or '']]</para>
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 27091dda8bd..6193a6299a1 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -55,6 +55,8 @@ class stock_picking(osv.osv):
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                  'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
                  }),
+        'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
+        'number_of_packages': fields.integer('Number of Packages'),
         }
 
     def action_invoice_create(self, cursor, user, ids, journal_id=False,
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 63b09121309..3a18406f607 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -38,7 +38,7 @@
     - After installing this module PDF's are no longer stored into the database,
       but in the servers rootpad like /server/bin/filestore.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['process','board', 'knowledge'],
     'init_xml': [],
@@ -46,7 +46,7 @@
         'security/document_security.xml',
         'document_view.xml',
         'document_data.xml',
-        'wizard/document_configuration_view.xml',
+#        'wizard/document_configuration_view.xml',
         'security/ir.model.access.csv',
         'report/document_report_view.xml',
         'board_document_view.xml',
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 8b8ef2557e6..4899178de2f 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -56,7 +56,6 @@
             id="menu_reports_document"
             parent="menu_reporting"
             sequence="0"
-            icon="terp-graph"
             groups="document.group_document_manager"/>
 
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 998d1e93188..f6e21f338e7 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -302,7 +302,7 @@
                     <filter string="Partner" icon="terp-personal" domain="[]"
                        context="{'group_by':'partner_id'}"  groups="base.group_extended"/>
                     <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
-                    <filter string="Type"  domain="[]" context="{'group_by':'type'}"  groups="base.group_extended"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"  groups="base.group_extended"/>
                     <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                 </group>
@@ -334,6 +334,8 @@
         <field name="res_model">ir.attachment</field>
         <field name="name">Document</field>
         <field name="view_type">form</field>
+        <field name="search_view_id" ref="view_attach_filter"/>
+        <field name="help">Documents give your access to all attached documents; it's a repository of all attached documents (mails, documents attached to a project, etc.)</field>
     </record>
     <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>
     <menuitem
diff --git a/addons/document/i18n/lt.po b/addons/document/i18n/lt.po
index d5e0991751e..9f8d304124d 100644
--- a/addons/document/i18n/lt.po
+++ b/addons/document/i18n/lt.po
@@ -1,76 +1,77 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* document
+#	* document
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.10\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:52+0000\n"
-"Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.com>\n"
+"PO-Revision-Date: 2010-07-20 22:11+0000\n"
+"Last-Translator: Paulius Sladkevičius <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-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
 #: field:document.directory,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Sukūrimo data"
 
 #. module: document
 #: field:document.directory,ressource_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "Šaltinio ID"
 
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr ""
+msgstr "Įtraukti įrašo pavadinimą"
 
 #. module: document
 #: 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: document
 #: field:ir.actions.report.xml,model_id:0
 msgid "Model Id"
-msgstr ""
+msgstr "Modelio ID"
 
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Klaida ! Jūs negalite sukurti pasikartojančių katalogų."
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_configuration
 msgid "Document Configuration"
-msgstr ""
+msgstr "Dokumentų konfigūracija"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Preview"
-msgstr ""
+msgstr "Peržiūrėti"
 
 #. module: document
 #: field:ir.attachment,store_method:0
 msgid "Storing Method"
-msgstr ""
+msgstr "Laikymo metodas"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Auto Configure Directory"
-msgstr ""
+msgstr "Automatinis katalogų konfigūravimas"
 
 #. module: document
 #: field:ir.attachment,file_size:0
 msgid "File Size"
-msgstr ""
+msgstr "Failo dydis"
 
 #. module: document
 #: help:document.directory.content,include_name:0
@@ -78,47 +79,50 @@ msgid ""
 "Check this field if you want that the name of the file start by the record "
 "name."
 msgstr ""
+"Pažymėkite šį lauką, jeigu norite kad failo pavadinimas prasidėtų taip pat "
+"kaip įrašo pavadinimas."
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Other Resources"
-msgstr ""
+msgstr "Kiti ištekliai"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr ""
+msgstr "Tėvinis modelis"
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Document Management System."
-msgstr ""
+msgstr "Dokumentų valdymo sistema"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Attachment"
-msgstr ""
+msgstr "Priedas"
 
 #. module: document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Netinkamas modelio pavadinimas veiksmo apibrėžime."
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Static Directory"
-msgstr ""
+msgstr "Statinis katalogas"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
 msgid "Directory Content Type"
-msgstr ""
+msgstr "Katalogo turinio tipas"
 
 #. module: document
 #: help:document.directory,domain:0
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
 msgstr ""
+"Naudoti sritį, jei norite taikyti automatinį filtrą matomiems ištekliams."
 
 #. module: document
 #: help:document.directory,ressource_tree:0
@@ -126,69 +130,73 @@ msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
 msgstr ""
+"Pažymėkite, jeigu norite naudoti tokią pačią medžio struktūrą kaip "
+"pasirinkto objekto."
 
 #. module: document
 #: field:document.directory,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipas"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
 #: model:ir.ui.menu,name:document.menu_document_directories_tree
 msgid "Directorie's Structure"
-msgstr ""
+msgstr "Katalogų struktūra"
 
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Item"
-msgstr ""
+msgstr "Tėvinis katalogas"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "File Information"
-msgstr ""
+msgstr "Failo informacija"
 
 #. module: document
-#: field:document.directory,file_ids:0 view:ir.attachment:0
+#: field:document.directory,file_ids:0
+#: view:ir.attachment:0
 msgid "Files"
-msgstr ""
+msgstr "Failai"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "Išsaugotas failo vardas"
 
 #. module: document
-#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0
+#: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr ""
+msgstr "Paskutinis pakeitęs naudotojas"
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigūruoti"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
 msgid "Tree Structure"
-msgstr ""
+msgstr "Medžio struktūra"
 
 #. module: document
 #: field:ir.attachment,title:0
 msgid "Resource Title"
-msgstr ""
+msgstr "Resurso antraštė"
 
 #. module: document
 #: model:ir.actions.todo,note:document.config_auto_directory
 msgid ""
 "This wizard will configure the URL of the server of the document management "
 "system."
-msgstr ""
+msgstr "Šis vedlys konfigūruoja dokumentų valdymo sistemos serverio URL"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
 msgid "Directory Content"
-msgstr ""
+msgstr "Katalogo turinys"
 
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
@@ -196,31 +204,34 @@ msgid ""
 "If you put an object here, this directory template will appear bellow all of "
 "these objects. Don't put a parent directory if you select a parent model."
 msgstr ""
+"Jeigu jūs įtraukėte objektą čia, visi šio objekto katalogų šablonai atsiras "
+"apačioje. Nenaudokite tėvinio katalogo, jei pasirinksite tėvinį modelį."
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document
 msgid "Document Management"
-msgstr ""
+msgstr "Dokumentų valdymas"
 
 #. module: document
 #: selection:ir.attachment,store_method:0
 msgid "Link"
-msgstr ""
+msgstr "Nuoroda"
 
 #. module: document
 #: view:document.directory:0
 msgid "Directory Type"
-msgstr ""
+msgstr "Katalogo tipas"
 
 #. module: document
-#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0
+#: field:ir.attachment,group_ids:0
 msgid "Groups"
-msgstr ""
+msgstr "Grupės"
 
 #. module: document
 #: field:document.directory.content,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Ataskaita"
 
 #. module: document
 #: help:document.configuration.wizard,host:0
@@ -228,6 +239,8 @@ msgid ""
 "Put here the server address or IP. Keep localhost if you don't know what to "
 "write."
 msgstr ""
+"Įrašykite keletą adresų ar IP.  Palikite localhost, jeigu nežinote, ką "
+"įrašyti."
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -235,31 +248,34 @@ msgid ""
 "This wizard will automatically configure the document management system "
 "according to modules installed on your system."
 msgstr ""
+"Šis vedlys automatiškai konfigūruoja dokumentų valdymo sistemą pagal "
+"modulius įdiegtus joje."
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Data"
-msgstr ""
+msgstr "Duomenys"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Notes"
-msgstr ""
+msgstr "Pastabos"
 
 #. module: document
-#: view:ir.attachment:0 field:ir.attachment,index_content:0
+#: view:ir.attachment:0
+#: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr ""
+msgstr "Indekso turinys"
 
 #. module: document
 #: view:document.directory:0
 msgid "Definition"
-msgstr ""
+msgstr "Aprašymas"
 
 #. module: document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Netinkamas XML peržiūros architektūrai!"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
@@ -273,91 +289,93 @@ msgstr ""
 #. module: document
 #: field:document.directory,name:0
 msgid "Name"
-msgstr ""
+msgstr "Pavadinimas"
 
 #. module: document
 #: field:document.directory.content.type,code:0
 msgid "Extension"
-msgstr ""
+msgstr "Plėtinys"
 
 #. module: document
 #: selection:ir.attachment,store_method:0
 msgid "Database"
-msgstr ""
+msgstr "Duomenų bazė"
 
 #. module: document
 #: field:document.directory,content_ids:0
 msgid "Virtual Files"
-msgstr ""
+msgstr "Virtualūs failai"
 
 #. module: document
 #: view:document.directory:0
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
-msgstr ""
+msgstr "Katalogai"
 
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr ""
+msgstr "Seka"
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
 msgid "Integrated Document Management System"
-msgstr ""
+msgstr "Integruota dokumentų valdymo sistema"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
 #: field:ir.attachment,parent_id:0
 msgid "Directory"
-msgstr ""
+msgstr "Katalogas"
 
 #. module: document
-#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0
+#: field:ir.attachment,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Savininkas"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration_wizard
 msgid "document.configuration.wizard"
-msgstr ""
+msgstr "Dokumentų konfigūracija"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Attached To"
-msgstr ""
+msgstr "Prisegtas"
 
 #. module: document
 #: selection:ir.attachment,store_method:0
 msgid "Filesystem"
-msgstr ""
+msgstr "Failų sistema"
 
 #. module: document
 #: field:document.directory,file_type:0
 #: field:document.directory.content.type,name:0
 #: field:ir.attachment,file_type:0
 msgid "Content Type"
-msgstr ""
+msgstr "Turinio tipas"
 
 #. module: document
-#: view:document.directory:0 view:ir.attachment:0
+#: view:document.directory:0
+#: view:ir.attachment:0
 msgid "Security"
-msgstr ""
+msgstr "Saugumas"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_browse
 msgid "Browse Files Using FTP"
-msgstr ""
+msgstr "Ieškoti failų naudojant FTP"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Directories Mapped to Objects"
-msgstr ""
+msgstr "Katalogai priskirti objektams"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "History"
-msgstr ""
+msgstr "Istorija"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
@@ -365,102 +383,105 @@ msgid ""
 "Select an object here and Open ERP will create a mapping for each of these "
 "objects, using the given domain, when browsing through FTP."
 msgstr ""
+"Jei naršote per FTP, čia pasirinkite objektą, Open ERP sukurs aplanką "
+"kiekvienam iš jų, naudojant pasirinktą sritį."
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Others Info"
-msgstr ""
+msgstr "Kita informacija"
 
 #. module: document
 #: field:document.directory,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Sritis"
 
 #. module: document
-#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0
+#: field:ir.attachment,write_date:0
 msgid "Date Modified"
-msgstr ""
+msgstr "Modifikavimo data"
 
 #. module: document
 #: field:document.directory.content,suffix:0
 msgid "Suffix"
-msgstr ""
+msgstr "Sufiksas"
 
 #. module: document
 #: field:document.configuration.wizard,host:0
 msgid "Server Address"
-msgstr ""
+msgstr "Serverio adresas"
 
 #. module: document
 #: model:ir.actions.url,name:document.action_document_browse
 msgid "Browse Files"
-msgstr ""
+msgstr "Ieškoti failų"
 
 #. module: document
 #: field:document.directory.content,name:0
 msgid "Content Name"
-msgstr ""
+msgstr "Turinio pavadinimas"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory
 #: field:process.node,directory_id:0
 msgid "Document directory"
-msgstr ""
+msgstr "Dokumentų katalogas"
 
 #. module: document
 #: field:document.directory,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "Kūrėjas"
 
 #. module: document
 #: view:document.directory:0
 msgid "Auto-Generated Files"
-msgstr ""
+msgstr "Automatiškai sugeneruoti failai"
 
 #. module: document
 #: field:document.directory.content,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seka"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_files
 msgid "Search a File"
-msgstr ""
+msgstr "Ieškoti failo"
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Auto Configure"
-msgstr ""
+msgstr "Automatinis konfigūravimas"
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 #. module: document
 #: field:ir.attachment,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partneris"
 
 #. module: document
 #: view:document.directory:0
 msgid "PDF Report"
-msgstr ""
+msgstr "PDF ataskaita"
 
 #. module: document
 #: field:document.directory.content,extension:0
 msgid "Document Type"
-msgstr ""
+msgstr "Dokumento tipas"
 
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Vaikai"
 
 #. module: document
 #: view:document.directory:0
 msgid "Contents"
-msgstr ""
+msgstr "Turinys"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
@@ -623,3 +644,11 @@ msgstr ""
 #: field:report.document.wall,last:0
 msgid "Last Posted Time"
 msgstr ""
+
+#, python-format
+#~ msgid "Directory name must be unique!"
+#~ msgstr "Katalogo pavadinimas turi būti unikalus!"
+
+#, python-format
+#~ msgid "Directory name contains special characters!"
+#~ msgstr "Katalogo pavadinime yra specialiųjų simbolių!"
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index e587c495654..2d84e46bdf6 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -1,25 +1,25 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* document
+#	* document
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:19+0000\n"
+"PO-Revision-Date: 2010-07-20 07: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-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
 #: field:document.directory,create_date:0
 msgid "Date Created"
-msgstr "建立日期"
+msgstr "创建日期"
 
 #. module: document
 #: field:document.directory,ressource_id:0
@@ -77,7 +77,7 @@ msgstr "文件大小"
 msgid ""
 "Check this field if you want that the name of the file start by the record "
 "name."
-msgstr "如果你想文件名开始是记录名称请选择它."
+msgstr "如果你想文件名是这记录的名称请选择它."
 
 #. module: document
 #: selection:document.directory,type:0
@@ -87,7 +87,7 @@ msgstr "其它资源"
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr "上级式样"
+msgstr "上级模型"
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -102,7 +102,7 @@ msgstr "附件"
 #. module: document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -112,20 +112,20 @@ msgstr "静态目录"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
 msgid "Directory Content Type"
-msgstr "目录内容分类"
+msgstr "目录内容类型"
 
 #. module: document
 #: help:document.directory,domain:0
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
-msgstr "如果你想使用可见资源的自动过滤这是使用的范围"
+msgstr "如果你想对可得到的资源自动过滤, 规定一个范围"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
-msgstr "如果你想在系统中使用相同的对象树状结构请选择这"
+msgstr "如果你想使用树结构象系统选定对象, 请选择这"
 
 #. module: document
 #: field:document.directory,type:0
@@ -149,7 +149,8 @@ msgid "File Information"
 msgstr "文件信息"
 
 #. module: document
-#: field:document.directory,file_ids:0 view:ir.attachment:0
+#: field:document.directory,file_ids:0
+#: view:ir.attachment:0
 msgid "Files"
 msgstr "文件"
 
@@ -159,7 +160,8 @@ msgid "Stored Filename"
 msgstr "保存文件名"
 
 #. module: document
-#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0
+#: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "最近修改用户"
 
@@ -176,14 +178,14 @@ msgstr "树结构"
 #. module: document
 #: field:ir.attachment,title:0
 msgid "Resource Title"
-msgstr "标题"
+msgstr "资源标题"
 
 #. module: document
 #: model:ir.actions.todo,note:document.config_auto_directory
 msgid ""
 "This wizard will configure the URL of the server of the document management "
 "system."
-msgstr "这向导将配置文档管理系统的URL"
+msgstr "这向导将配置服务器文档管理系统的URL"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
@@ -195,9 +197,7 @@ msgstr "目录内容"
 msgid ""
 "If you put an object here, this directory template will appear bellow all of "
 "these objects. Don't put a parent directory if you select a parent model."
-msgstr ""
-"如果你在这填上对象,这目录的模板将涵盖所有的对象.如果您选择母公司模式不要填入"
-"父目录"
+msgstr "如果你在这填上对象, 这目录的模板将出现在所有的对象. 如果您选择上级模式不要填入上级目录"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document
@@ -215,7 +215,8 @@ msgid "Directory Type"
 msgstr "目录类型"
 
 #. module: document
-#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0
+#: field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "组"
 
@@ -249,7 +250,8 @@ msgid "Notes"
 msgstr "备注"
 
 #. module: document
-#: view:ir.attachment:0 field:ir.attachment,index_content:0
+#: view:ir.attachment:0
+#: field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "内容索引"
 
@@ -261,7 +263,7 @@ msgstr "定义"
 #. module: document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
@@ -284,7 +286,7 @@ msgstr "名称"
 #. module: document
 #: field:document.directory.content.type,code:0
 msgid "Extension"
-msgstr "延伸"
+msgstr "扩展"
 
 #. module: document
 #: selection:ir.attachment,store_method:0
@@ -305,7 +307,7 @@ msgstr "目录"
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr "序号"
+msgstr "序列"
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
@@ -319,14 +321,15 @@ msgid "Directory"
 msgstr "说明"
 
 #. module: document
-#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0
+#: field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "拥有者"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration_wizard
 msgid "document.configuration.wizard"
-msgstr "文档结构向导"
+msgstr ""
 
 #. module: document
 #: view:ir.attachment:0
@@ -346,7 +349,8 @@ msgid "Content Type"
 msgstr "内容类型"
 
 #. module: document
-#: view:document.directory:0 view:ir.attachment:0
+#: view:document.directory:0
+#: view:ir.attachment:0
 msgid "Security"
 msgstr "安全"
 
@@ -370,10 +374,7 @@ msgstr "日志"
 msgid ""
 "Select an object here and Open ERP will create a mapping for each of these "
 "objects, using the given domain, when browsing through FTP."
-msgstr ""
-"选择一对象,系统将创建一个每个对象的列表,使用给定的域,通过FTP浏览\"\n"
-"document,view,document.directory,0,Seq.,序列\n"
-"document,field,document.directory.content"
+msgstr "通过FTP浏览, 使用给定的域, 在这选择一对象, 系统将创建一个每个对象的列表,"
 
 #. module: document
 #: view:ir.attachment:0
@@ -383,10 +384,11 @@ msgstr "其它信息"
 #. module: document
 #: field:document.directory,domain:0
 msgid "Domain"
-msgstr "隶属"
+msgstr "域"
 
 #. module: document
-#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0
+#: field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "修改日期"
 
@@ -474,19 +476,19 @@ msgstr "内容"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
 msgid "Files Per Month"
-msgstr "月度文件"
+msgstr "每月文件"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_wall
 #: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr "羞愧者名单"
+msgstr "耻辱之墙"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr "业务伙伴文件详细信息"
+msgstr "业务伙伴的文件详情"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
@@ -502,7 +504,7 @@ msgstr "我的文件"
 #. module: document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr "用户文件"
+msgstr "用户的文件"
 
 #. module: document
 #: view:report.files.partner:0
@@ -517,17 +519,17 @@ msgstr "我的文件(所有月份)"
 #. module: document
 #: field:report.document.wall,file_name:0
 msgid "Last Posted File Name"
-msgstr "最近发布的文件名"
+msgstr "最近上传的文件"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_action_view_my_document_report
 msgid "Reporting"
-msgstr "内部报表"
+msgstr "报表"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr "一个月以来用户没有新文件"
+msgstr "一个月内没有新文件的用户"
 
 #. module: document
 #: view:report.files.partner:0
@@ -548,28 +550,28 @@ msgstr "用户"
 #: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
 #: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
 msgid "All Users files"
-msgstr "所有用户文件"
+msgstr "所有用户的文件"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_my_document_tree
 msgid "My files (This months)"
-msgstr "我的文件(这月)"
+msgstr "我的文件（本月）"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
 msgid "Files details by Users"
-msgstr "用户详细信息"
+msgstr "用户的文件详情"
 
 #. module: document
 #: field:report.document.file,nbr:0 field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
-msgstr "文件号"
+msgstr "# 文件"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr "用户文件"
+msgstr "用户的文件"
 
 #. module: document
 #: model:ir.module.module,shortdesc:report_document.module_meta_information
@@ -579,12 +581,12 @@ msgstr "文档管理 - 报表"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
 msgid "All Users files (All months)"
-msgstr "所有文件(所有月份)"
+msgstr "所有用户的文件（所有月份）"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_file
 msgid "Files details by Directory"
-msgstr "文件详细目录"
+msgstr "目录文件详情"
 
 #. module: document
 #: field:report.document.user,change_date:0
@@ -596,7 +598,7 @@ msgstr "修改日期"
 #: model:ir.actions.act_window,name:document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr "这月的文件大小"
+msgstr "按月度排列文件大小"
 
 #. module: document
 #: field:report.document.user,file_title:0
@@ -609,13 +611,13 @@ msgstr "文件名"
 #: field:report.document.user,name:0 field:report.document.wall,month:0
 #: field:report.document.wall,name:0 field:report.files.partner,name:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr "这月的文件"
+msgstr "按月度排列文件"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
@@ -626,7 +628,7 @@ msgstr "文件的资源类型"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree
 msgid "All Users files (This month)"
-msgstr "所有文件(所有月份)"
+msgstr "所有用户的文件（本月）"
 
 #. module: document
 #: field:report.document.wall,last:0
@@ -635,19 +637,3 @@ msgstr "最近的发布时间"
 
 #~ msgid "Active"
 #~ msgstr "生效"
-
-#~ msgid ""
-#~ "\n"
-#~ "    Reporting for the Document Management module:\n"
-#~ "    * My Files\n"
-#~ "    * All users Files \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    报告文档管理模块:\n"
-#~ "\t\t- 我的文件\n"
-#~ "\t\t- 所有用户的文件 \n"
-#~ "    "
-
-#~ msgid "Files Per Partner"
-#~ msgstr "每个业务伙伴文件"
diff --git a/addons/document/test/document_test2.yml b/addons/document/test/document_test2.yml
index 712399afac3..34e834a5306 100644
--- a/addons/document/test/document_test2.yml
+++ b/addons/document/test/document_test2.yml
@@ -1,10 +1,10 @@
-- 
-    In order to test the document management
 -
-    I make sure the default installation has some storage and root directory.
+    In order to test the document management I make sure the default installation has some storage.
 -
     !assert {model: document.storage, id: storage_default }:
       - id != False
+-
+    I make sure the default installation has some root directory.
 -
     !assert {model: document.directory, id: dir_root}:
       - storage_id != False
@@ -19,11 +19,12 @@
     defaults work)
 -
     !record {model: ir.attachment, id: file_test1 }:
-        name: Test file
+        name: Test file.txt
 -
     I delete the attachment from the root folder
 -
-    !delete {model: ir.attachment, id: file_test1, search: }
+    !python {model: ir.attachment}: |
+     self.unlink(cr, uid, [ref('file_test1')])
 -
     I create an attachment into the Testing folder.
 -
@@ -34,13 +35,13 @@
     I update the attachment with data, namely "abcd"
 -
     !record {model: ir.attachment, id: file_test2 }:
-        datas: "abcd"
+        datas: "YWJjZA==\n"
 -
     I test that the datas of the attachment are correct
 -
     !assert {model: ir.attachment, id: file_test2 }:
-        - datas == "abcd\n"
-        - file_size == 5
+        - datas == "YWJjZA==\n"
+        - file_size == 4
         - file_type == 'text/plain'
 -
     I rename the attachment.
@@ -57,9 +58,9 @@
     I create an attachment to a 3rd resource, eg. a res.country
 -
     !record {model: ir.attachment, id: attach_3rd }:
-        name: 'Res country attachment.txt'
+        name: 'Country attachment.txt'
         parent_id: dir_tests
-        datas: 'defg'
+        datas: "Q291bnRyeSBhdHRhY2htZW50IGNvbnRlbnQ=\n"
         res_model: res.country
         res_id: !eval ref("base.za")
 -
@@ -69,4 +70,7 @@
         ids = self.search(cr, uid, [('res_model', '=', 'res.country'), ('res_id', '=', ref("base.za"))])
         assert ids == [ ref("attach_3rd")], ids
 -
-    !delete {model: ir.attachment, id: attach_3rd, search: }
+    I delete the attachment
+-
+    !python {model: ir.attachment}: |
+     self.unlink(cr, uid, [ref('attach_3rd')])
diff --git a/addons/document_email/__openerp__.py b/addons/document_email/__openerp__.py
index 5f628b2a02c..e341678e009 100644
--- a/addons/document_email/__openerp__.py
+++ b/addons/document_email/__openerp__.py
@@ -30,7 +30,7 @@
     * Email based Document submission
     * user based document subission
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'init_xml': [],
     'update_xml': [
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 89281c9072f..fbae2266215 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -29,7 +29,7 @@
     but you would also be able to connect with them through the file system using the 
     a FTP client.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'document'],
     'init_xml': [],
diff --git a/addons/document_ics/__openerp__.py b/addons/document_ics/__openerp__.py
index 4ad979fec5c..1ef049f9833 100644
--- a/addons/document_ics/__openerp__.py
+++ b/addons/document_ics/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Others',
     'description': """Allows to synchronise calendars with others applications.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['document', 'crm'],
     'init_xml': ['document_data.xml'],
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index ea7e5926868..d19951deb38 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -11,12 +11,22 @@
                 <form position="attributes">
                   <attribute name="string">Configure Calendars for CRM Sections</attribute>
                 </form>
-                <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0"
-                         string="OpenERP can create and pre-configure a series of integrated calendar for you."/>
-                  <separator string="Create Pre-Configured Calendars"
-                             colspan="4"/>
-                  <newline/>
+                <separator string="title" position="attributes">
+                <attribute name="string"
+                       >Create Pre-Configured Calendars</attribute>
+                  </separator>
+                  <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">OpenERP can create and pre-configure a series of integrated calendar for you.</attribute>
+                    <attribute name="width">200</attribute>
+                  </xpath>
+                   <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                          <attribute name='rowspan'>15</attribute>
+                          <attribute name='string'></attribute>
+                  </xpath>
+                  <xpath expr="//button[@name='action_next']" position="attributes">
+                    <attribute name="string">Configure</attribute>
+                   </xpath>
+                  <group string="res_config_contents" position="replace">
                   <field name="meeting"/>
                   <field name="opportunity"/>
                   <field name="phonecall"/>
@@ -27,8 +37,6 @@
                   <field name="jobs"/>
                   <field name="fund"/>
                 </group>
-                <xpath expr='//button[@name="action_skip"]'
-                       position='replace'/>
               </data>
             </field>
         </record>
@@ -43,7 +51,7 @@
             <field name="target">new</field>
         </record>
 
-        <!-- register configuration wizard -->
+         register configuration wizard
         <record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_view_document_ics_config_directories"/>
         </record>
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index 8d13210355b..c0080418e51 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.po
@@ -7,25 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:19+0000\n"
+"PO-Revision-Date: 2010-07-20 07: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-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
-msgstr "用户标识符"
+msgstr "用户ID"
 
 #. module: document_ics
 #: constraint:document.directory:0
@@ -35,17 +35,17 @@ msgstr "错误:你无法建立递归的目录"
 #. module: document_ics
 #: field:document.ics.crm.wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr "招聘过程"
+msgstr "招聘流程"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure Calendars for CRM Sections"
-msgstr "客户关系管理部分设置日程表"
+msgstr "设置crm的日程表"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,helpdesk:0
 msgid "Helpdesk"
-msgstr "求助"
+msgstr "帮助平台"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
@@ -55,7 +55,7 @@ msgstr "系统字段"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Next"
-msgstr "下一个"
+msgstr "下一步"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -80,7 +80,7 @@ msgstr "信息地址（url）"
 #. module: document_ics
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,bugs:0
@@ -92,7 +92,7 @@ msgstr "公司用于跟踪缺陷和支持请求的软件"
 msgid ""
 "This Configuration step use to create Calendars in document for all Case "
 "Sections"
-msgstr "这设置步骤用于创建在所有业务个案项文档的日程表"
+msgstr "这设置步骤用于创建所有划分的业务个案的日程表"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -114,28 +114,28 @@ msgstr "说明"
 #. module: document_ics
 #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
 msgid "Configure Calendars for Sections "
-msgstr "部分设置日程表 "
+msgstr "设置划分的业务个案的日程表 "
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr "从你的销售管线跟踪出销售机会"
+msgstr "从你的销售渠道跟踪出销售机会"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,fund:0
 msgid ""
 "This may help associations in their fund raising process and tracking."
-msgstr "这可能有助于协会在资助和投资过程和跟踪"
+msgstr "这也许有助于协会筹款的进程和跟踪"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr "管理求助服务"
+msgstr "管理帮助平台服务"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr "资助和投资行动"
+msgstr "筹款运作"
 
 #. module: document_ics
 #: field:document.directory.content,ics_object_id:0
@@ -145,17 +145,17 @@ msgstr "对象"
 #. module: document_ics
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr "错误！你不能创建递归的项"
+msgstr "错误！你不能创建递归的细项"
 
 #. module: document_ics
 #: model:ir.module.module,shortdesc:document_ics.module_meta_information
 msgid "Support for iCal based on Document Management System"
-msgstr "支持iCal的文档管理系统"
+msgstr "文档管理系统支持iCal"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "location"
-msgstr "本地"
+msgstr "位置"
 
 #. module: document_ics
 #: view:document.directory:0
@@ -175,14 +175,14 @@ msgstr "允许的同步其它应用日程表"
 #. module: document_ics
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,lead:0
 msgid ""
 "Allows you to track and manage prospects which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
-msgstr "允许你跟踪管理潜在客户的售前请求和联系,初次联系客户的请求"
+msgstr "允许你在响应潜在客户的售前请求和联系时跟踪管理, 首次联系客户的请求"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -197,14 +197,14 @@ msgstr "管理用户的会议日程表"
 #. module: document_ics
 #: field:document.directory.content,ics_domain:0
 msgid "Domain"
-msgstr "隶属"
+msgstr "域"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
 msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
-msgstr "管理这支援和客户服务要求包括你的纠正或预防"
+msgstr "管理客户和供应商的索赔, 包括您的纠正或预防措施"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -229,7 +229,7 @@ msgstr "共享的日程表"
 #. module: document_ics
 #: field:document.ics.crm.wizard,claims:0
 msgid "Claims"
-msgstr "服务要求"
+msgstr "索赔"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,phonecall:0
@@ -271,7 +271,7 @@ msgstr "创建预先设置的日程表"
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "created"
-msgstr "创建"
+msgstr "已创建"
 
 #. module: document_ics
 #: field:crm.case,code:0
@@ -281,7 +281,7 @@ msgstr "日程表代码"
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "summary"
-msgstr "参考"
+msgstr "摘要"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_ics_crm_wizard
@@ -296,7 +296,7 @@ msgstr "出勤者"
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_directory_ics_fields
 msgid "document.directory.ics.fields"
-msgstr "字段"
+msgstr ""
 
 #. module: document_ics
 #: field:document.directory.content,ics_field_ids:0
@@ -311,7 +311,7 @@ msgstr "取消"
 #. module: document_ics
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
-msgstr "销售机会"
+msgstr "商机"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 24893c275e1..39330f68dea 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -31,7 +31,7 @@
 {
 	"name" : "WebDAV server for Document Management",
 	"version" : "2.0",
-	"author" : "Tiny",
+	"author" : "OpenERP SA",
 	"category" : "Generic Modules/Others",
 	"website": "http://www.openerp.com",
 	"description": """ With this module, the WebDAV server for the documents is activated.
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 730502bc549..5aedea7ed72 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -62,6 +62,7 @@ import email_template_engines
 import tools
 import report
 import pooler
+import logging
 
 def get_value(cursor, user, recid, message=None, template=None, context=None):
     """
@@ -99,6 +100,7 @@ def get_value(cursor, user, recid, message=None, template=None, context=None):
                 reply = templ.render(Context(env))
             return reply or False
         except Exception:
+            logging.exception("can't render %r", message)
             return u""
     else:
         return message
@@ -131,11 +133,13 @@ class email_template(osv.osv):
                    string="Enforce From Account",
                    help="Emails will be sent only from this account(which are approved)."),
         'from_email' : fields.related('enforce_from_account', 'email_id',
-                                                type='char', string='From',),        
+                                                type='char', string='From',
+                                                help='From Email (select mail account)',
+                                                readonly=True),        
         'def_to':fields.char(
-                 'Recepient (To)',
+                 'Recipient (To)',
                  size=250,
-                 help="The default recepient of email." 
+                 help="The default recipient of email." 
                  "Placeholders can be used here."),
         'def_cc':fields.char(
                  'Default CC',
@@ -170,7 +174,7 @@ class email_template(osv.osv):
         'use_sign':fields.boolean(
                   'Signature',
                   help="the signature from the User details" 
-                  "will be appened to the mail"),
+                  " will be appended to the mail"),
         'file_name':fields.char(
                 'File Name Pattern',
                 size=200,
@@ -543,7 +547,7 @@ class email_template(osv.osv):
         if lang:
             ctx = context.copy()
             ctx.update({'lang':lang})
-            template = self.browse(cursor, user, template_id, context=ctx)
+            template = self.browse(cursor, user, template.id, context=ctx)
         mailbox_values = {
             'email_from': tools.ustr(from_account['name']) + \
                         "<" + tools.ustr(from_account['email_id']) + ">",
@@ -641,7 +645,7 @@ class email_template(osv.osv):
                                                         context=context
                                                               )
             if template.report_template:
-                self._generate_attach_reports(
+                self.generate_attach_reports(
                                               cursor,
                                               user,
                                               template,
diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index e5bbe0f5e56..8c71ce05ddf 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -59,21 +59,23 @@ class email_template_account(osv.osv):
         'user':fields.many2one('res.users',
                         'Related User', required=True,
                         readonly=True, states={'draft':[('readonly', False)]}),
-        'email_id': fields.char('Email ID',
+        'email_id': fields.char('From Email',
                         size=120, required=True,
                         readonly=True, states={'draft':[('readonly', False)]} ,
-                        help=" eg:yourname@yourdomain.com "),
+                        help="eg: yourname@yourdomain.com "),
         'smtpserver': fields.char('Server',
                         size=120, required=True,
                         readonly=True, states={'draft':[('readonly', False)]},
-                        help="Enter name of outgoing server,eg:smtp.gmail.com "),
+                        help="Enter name of outgoing server, eg:smtp.gmail.com "),
         'smtpport': fields.integer('SMTP Port ',
                         size=64, required=True,
                         readonly=True, states={'draft':[('readonly', False)]},
                         help="Enter port number,eg:SMTP-587 "),
         'smtpuname': fields.char('User Name',
                         size=120, required=False,
-                        readonly=True, states={'draft':[('readonly', False)]}),
+                        readonly=True, states={'draft':[('readonly', False)]},
+                        help="Specify the username if your SMTP server requires authentication, "
+                        "otherwise leave it empty."),
         'smtppass': fields.char('Password',
                         size=120, invisible=True,
                         required=False, readonly=True,
@@ -91,11 +93,11 @@ class email_template_account(osv.osv):
         'company':fields.selection([
                         ('yes', 'Yes'),
                         ('no', 'No')
-                        ], 'Company Mail A/c',
+                        ], 'Corporate',
                         readonly=True,
-                        help="Select if this mail account does not belong" \
-                        "to specific user but the organisation as a whole." \
-                        "eg:info@somedomain.com",
+                        help="Select if this mail account does not belong " \
+                        "to specific user but to the organization as a whole. " \
+                        "eg: info@companydomain.com",
                         required=True, states={
                                            'draft':[('readonly', False)]
                                            }),
@@ -316,8 +318,6 @@ class email_template_account(osv.osv):
                         msg['To'] = u','.join(addresses_l['To'])
                     if addresses_l['CC']:
                         msg['CC'] = u','.join(addresses_l['CC'])
-#                    if addresses_l['BCC']:
-#                        msg['BCC'] = u','.join(addresses_l['BCC'])
                     if body.get('text', False):
                         temp_body_text = body.get('text', '')
                         l = len(temp_body_text.replace(' ', '').replace('\r', '').replace('\n', ''))
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 4a35134bb41..6ef2d04e57f 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -24,7 +24,7 @@
                                 <field name="smtpssl" select="2" colspan="2" />
                                 <field name="smtptls" select="2" colspan="2" />
                             </group>
-                            <button name="check_outgoing_connection" type="object" string="Check Outgoing Connection" />
+                            <button name="check_outgoing_connection" type="object" string="Test Outgoing Connection" />
                             <separator string="User Information" colspan="4" />
                             <group col="2" colspan="2">
                                 <field name="email_id" select="1" on_change="on_change_emailid(name,email_id)" colspan="2" />
@@ -54,7 +54,7 @@
             <field name="model">email_template.account</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="SMTP Server">
+                <tree  colors="blue:state in ('draft');black:state in ('suspended','approved')" string="SMTP Server">
                     <field name="name" select="2" />
                     <field name="email_id" select="2" />
                     <field name="smtpuname" select="2" />
diff --git a/addons/email_template/wizard/email_template_send_wizard.py b/addons/email_template/wizard/email_template_send_wizard.py
index 5e0f0619c1b..4b1aba3a2aa 100755
--- a/addons/email_template/wizard/email_template_send_wizard.py
+++ b/addons/email_template/wizard/email_template_send_wizard.py
@@ -68,6 +68,8 @@ class email_template_send_wizard(osv.osv_memory):
         return template
 
     def _get_template_value(self, cr, uid, field, context=None):
+        if context is None:
+            context = {}
         template = self._get_template(cr, uid, context)
         if not template:
             return False
@@ -119,6 +121,8 @@ class email_template_send_wizard(osv.osv_memory):
     }
 
     def fields_get(self, cr, uid, fields=None, context=None, write_access=True):
+        if context is None:
+            context = {}
         result = super(email_template_send_wizard, self).fields_get(cr, uid, fields, context, write_access)
         if 'attachment_ids' in result and 'src_model' in context:
             result['attachment_ids']['domain'] = [('res_model','=',context['src_model']),('res_id','=',context['active_id'])]
@@ -165,6 +169,8 @@ class email_template_send_wizard(osv.osv_memory):
             else:
                 return value
 
+        if context is None:
+            context = {}
         mail_ids = []
         template = self._get_template(cr, uid, context)
         for id in context['src_rec_ids']:
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 634484deecb..0d8bd245db1 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -32,24 +32,22 @@
         * ...
     A dashboard for associations that includes:
     * Registration by Events (graph)
-    * Next Events (list)
-    * Unpaid Invoices (list)
     Note that:
     - You can define new types of events in
                 Events / Configuration / Types of Events
     - You can access predefined reports about number of registration per event or per event category in:
                 Events / Reporting
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['crm', 'base_contact', 'account'],
-    'init_xml': ['event_data.xml'],
+    'init_xml': [],
     'update_xml': [
-        'wizard/event_confirm_registration_view.xml',
-        'event_view.xml',
-        'report/report_event_registration_view.xml',
-        'event_sequence.xml',
         'security/event_security.xml',
         'security/ir.model.access.csv',
+        'wizard/event_confirm_registration_view.xml',
+        'wizard/event_confirm_view.xml',
+        'event_view.xml',
+        'report/report_event_registration_view.xml',
         'wizard/event_make_invoice_view.xml',
         'wizard/partner_event_registration_view.xml',
         'board_association_view.xml',
diff --git a/addons/event/board_association_demo.xml b/addons/event/board_association_demo.xml
index c30dad64790..1e66696aa8b 100644
--- a/addons/event/board_association_demo.xml
+++ b/addons/event/board_association_demo.xml
@@ -2,17 +2,6 @@
 <openerp>
 	<data noupdate="1">
 
-		<!--
-			Administrator shortcut
-			Demo user startup menu
-		-->
-<!--		<record model="ir.ui.view_sc" id="sc_association_dash">-->
-<!--			<field name="name">Dashboard</field>-->
-<!--			<field name="user_id" ref="base.user_root"/>-->
-<!--			<field name="resource">ir.ui.menu</field>-->
-<!--			<field name="sequence">1</field>-->
-<!--			<field name="res_id" ref="menu_board_associations_manager"/>-->
-<!--		</record>-->
 		<record model="res.users" id="base.user_root">
 			<field name="action_id" ref="open_board_associations_manager"/>
 		</record>
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 157db407ab8..a6613284850 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -84,7 +84,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
-        <menuitem id="board_associations" icon="terp-graph" name="Dashboard" parent="menu_report_event" sequence="0"/>
+        <menuitem id="board_associations" name="Dashboard" parent="base.menu_report_association" sequence="0"/>
         <menuitem
             name="Associations" parent="board_associations"
             action="open_board_associations_manager"
diff --git a/addons/event/event.py b/addons/event/event.py
index d7daca5552a..bc04927da36 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -26,44 +26,35 @@ import netsvc
 import pooler
 import time
 import tools
+import decimal_precision as dp
 
-
-class event_type(osv.osv):    
-    """ Event Type """    
+class event_type(osv.osv):
+    """ Event Type """
     _name = 'event.type'
     _description = __doc__
     _columns = {
-        'name': fields.char('Event type', size=64, required=True), 
+        'name': fields.char('Event type', size=64, required=True),
     }
 event_type()
 
-class event_event(osv.osv):    
-    """Event"""    
+class event_event(osv.osv):
+    """Event"""
     _name = 'event.event'
     _description = __doc__
-    _inherit = 'crm.case.section'
     _order = 'date_begin'
-    
-    def _get_currency(self, cr, uid, context):
-        user = self.pool.get('res.users').browse(cr, uid, [uid])[0]
-        if user.company_id:
-            return user.company_id.currency_id.id
-        else:
-            return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]    
-        
-    def copy(self, cr, uid, id, default=None, context=None):        
-        """ Copy record of Given id       
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        """ Copy record of Given id
         @param id: Id of Event record.
         @param context: A standard dictionary for contextual values
         """
         if not default:
             default = {}
         default.update({
-            'code': self.pool.get('ir.sequence').get(cr, uid, 'event.event'), 
-            'state': 'draft'
-        })    
+            'state': 'draft',
+            'registration_ids': False,
+        })
         return super(event_event, self).copy(cr, uid, id, default=default, context=context)
-    
     def onchange_product(self, cr, uid, ids, product_id):
         """This function returns value of  product's unit price based on product id.
         @param self: The object pointer
@@ -85,34 +76,69 @@ class event_event(osv.osv):
         return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
     def button_done(self, cr, uid, ids, context=None):
+        if type(ids) in (int, long,):
+            ids = [ids]
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
-    def button_confirm(self, cr, uid, ids, context=None):
-        """This Funtion send reminder who had already confirmed their event registration.
-        @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 Event IDs
-        @param return: True
+    def do_confirm(self, cr, uid, ids, context=None):
+        """ Confirm Event and send confirmation email to all register peoples
         """
         register_pool = self.pool.get('event.registration')
         for event in self.browse(cr, uid, ids, context=context):
             if event.mail_auto_confirm:
                 #send reminder that will confirm the event for all the people that were already confirmed
                 reg_ids = register_pool.search(cr, uid, [
-                               ('event_id', '=', event.id), 
+                               ('event_id', '=', event.id),
                                ('state', 'not in', ['draft', 'cancel'])])
                 register_pool.mail_user_confirm(cr, uid, reg_ids)
-                    
+
         return self.write(cr, uid, ids, {'state': 'confirm'})
 
+    def button_confirm(self, cr, uid, ids, context=None):
+        """This Function Confirm Event.
+        @param ids: List of Event IDs
+        @param context: A standard dictionary for contextual values
+        @return: True
+        """
+        if not context:
+            context = {}
+        res = False
+        if type(ids) in (int, long,):
+            ids = [ids]
+        data_pool = self.pool.get('ir.model.data')
+        unconfirmed_ids = []
+        for event in self.browse(cr, uid, ids, context=context):
+            total_confirmed = event.register_current
+            if total_confirmed >= event.register_min or event.register_max == 0:
+                res = self.do_confirm(cr, uid, [event.id], context=context)
+            else:
+                unconfirmed_ids.append(event.id)
+        if unconfirmed_ids:
+            view_id = data_pool._get_id(cr, uid, 'event', 'view_event_confirm')
+            view_data = data_pool.browse(cr, uid, view_id)
+            view_id = view_data.res_id
+            context['event_ids'] = unconfirmed_ids
+            return {
+                'name': _('Confirm Event'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'event.confirm',
+                'views': [(view_id, 'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'context': context,
+                'nodestroy': True
+            }        
+        return res
 
-    def _get_register(self, cr, uid, ids, fields, args, context=None):        
+
+    def _get_register(self, cr, uid, ids, fields, args, context=None):
         """Get Confirm or uncofirm register value.
         @param ids: List of Event registration type's id
         @param fields: List of function fields(register_current and register_prospect).
         @param context: A standard dictionary for contextual values
-        @return: Dictionary of function fields value. 
+        @return: Dictionary of function fields value.
         """
         register_pool = self.pool.get('event.registration')
         res = {}
@@ -122,19 +148,19 @@ class event_event(osv.osv):
                 res[event.id][field] = False
             state = []
             if 'register_current' in fields:
-                state.append('open')
-            if 'register_prospect' in fields: 
+                state += ['open', 'done']
+            if 'register_prospect' in fields:
                 state.append('draft')
-            
+
             reg_ids = register_pool.search(cr, uid, [
-                        ('event_id', '=', event.id), 
+                        ('event_id', '=', event.id),
                        ('state', 'in', state)])
-            
+
             if 'register_current' in fields:
                 res[event.id]['register_current'] = len(reg_ids)
-            if 'register_prospect' in fields: 
+            if 'register_prospect' in fields:
                 res[event.id]['register_prospect'] = len(reg_ids)
-               
+
         return res
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -169,107 +195,180 @@ class event_event(osv.osv):
         return res
 
     _columns = {
-        'type': fields.many2one('event.type', 'Type', help="Type of Event like Seminar, Exhibition, Conference, Training."), 
-        'register_max': fields.integer('Maximum Registrations', help="Provide Maximun Number of Registrations"), 
-        'register_min': fields.integer('Minimum Registrations', help="Providee Minimum Number of Registrations"), 
-        'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current', help="Total of Open Registrations"), 
-        'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect', help="Total of Prospect Registrations"), 
-        'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event"), 
-        'date_end': fields.datetime('Closing date', required=True, help="Closing Date of Event"), 
-        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True, help='If event is created, the state is \'Draft\'.\n If event is confirmed for the particular dates the state is set to \'Confirmed\'.\
-                                  \nIf the event is over, the state is set to \'Done\'.\n If event is cancelled the state is set to \'Cancelled\'.'), 
-        'mail_auto_registr': fields.boolean('Mail Auto Register', help='Check this box if you want to use the automatic mailing for new registration'), 
-        'mail_auto_confirm': fields.boolean('Mail Auto Confirm', help='Check this box if you want ot use the automatic confirmation emailing or the reminder'), 
-        'mail_registr': fields.text('Registration Email', help='This email will be sent when someone subscribes to the event.'), 
-        'mail_confirm': fields.text('Confirmation Email', help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."), 
-        'product_id': fields.many2one('product.product', 'Product', required=True, help="Product which is provided cost of event. Invoice of event will be created with this Product."),
-        'note': fields.text('Notes', help="Description or Summary of Event"),
-        'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        "unit_price": fields.float('Cost'),
-        'main_speaker_id': fields.many2one('res.partner','Main Speaker'),
-        'speaker_ids':fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers'),
-        'address_id': fields.many2one('res.partner.address','Location Room'),
-        'speaker_confirmed': fields.boolean('Speaker Confirmed'),
+        'name': fields.char('Summary', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
+        'parent_id': fields.many2one('event.event', 'Parent Event', readonly=False, states={'done': [('readonly', True)]}),
+        'section_id': fields.many2one('crm.case.section', 'Sale Team', readonly=False, states={'done': [('readonly', True)]}),
+        'child_ids': fields.one2many('event.event', 'parent_id', 'Child Events', readonly=False, states={'done': [('readonly', True)]}),
+        'reply_to': fields.char('Reply-To', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address put in the 'Reply-To' of all emails sent by Open ERP"),
+        'type': fields.many2one('event.type', 'Type', help="Type of Event like Seminar, Exhibition, Conference, Training.", readonly=False, states={'done': [('readonly', True)]}),
+        'register_max': fields.integer('Maximum Registrations', help="Provide Maximun Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_min': fields.integer('Minimum Registrations', help="Providee Minimum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current',
+            help="Total of Open and Done Registrations"),
+        'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect',
+            help="Total of Prospect Registrations"),
+        'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
+        'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
+        'date_end': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
+        'state': fields.selection([
+            ('draft', 'Draft'),
+            ('confirm', 'Confirmed'),
+            ('done', 'Done'),
+            ('cancel', 'Cancelled')],
+            'State', readonly=True, required=True,
+            help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'),
+        'mail_auto_registr': fields.boolean('Mail Auto Register', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use the automatic mailing for new registration'),
+        'mail_auto_confirm': fields.boolean('Mail Auto Confirm', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
+        'mail_registr': fields.text('Registration Email', readonly=False, states={'done': [('readonly', True)]}, help='This email will be sent when someone subscribes to the event.'),
+        'mail_confirm': fields.text('Confirmation Email', readonly=False, states={'done': [('readonly', True)]}, help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."),
+        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="The invoices of this event registration will be created with this Product. Thus it allows you to set the default label and the accounting info you want by default on these invoices."),
+        'note': fields.text('Notes', help="Description or Summary of Event", readonly=False, states={'done': [('readonly', True)]}),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current event."),
+        'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify for each registration a specific amount if you want to"),
+        'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who are giving speech on event."),
+        'speaker_ids':fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}),
+        'address_id': fields.many2one('res.partner.address','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),
         'country_id': fields.related('address_id', 'country_id',
-                    type='many2one', relation='res.country', string='Country'),
-        'language': fields.char('Language',size=64),
-        
+                    type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}),
+        'language': fields.char('Language',size=64, readonly=False, states={'done': [('readonly', True)]}),
+        'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
+        'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
+
     }
 
     _defaults = {
-        'state': 'draft', 
-       # 'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'event.event'), 
-        'user_id': lambda obj, cr, uid, context: uid, 
-        'currency_id': _get_currency,
+        'state': 'draft',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
+        'user_id': lambda obj, cr, uid, context: uid,
     }
 
+    def _check_recursion(self, cr, uid, ids):
+        """
+        Checks for recursion level for event
+        """
+        level = 100
+
+        while len(ids):
+            cr.execute('select distinct parent_id from event_event where id IN %s', (tuple(ids),))
+            ids = filter(None, map(lambda x: x[0], cr.fetchall()))
+            if not level:
+                return False
+            level -= 1
+
+        return True
+
+    _constraints = [
+        (_check_recursion, 'Error ! You cannot create recursive event.', ['parent_id'])
+    ]
+
+    def do_team_change(self, cr, uid, ids, team_id, context=None):
+        """
+        On Change Callback: when team change, this is call.
+        on this function, take value of reply_to from selected team.
+        """
+        if not team_id:
+            return {}
+        if context is None:
+            context = {}
+        team_pool = self.pool.get('crm.case.section')
+        team = team_pool.browse(cr, uid, team_id, context=context)
+        res = {}
+        if team.reply_to:
+            res = {'value': {'reply_to': team.reply_to}}
+        return res
 
 event_event()
 
-class event_registration(osv.osv):    
-    """Event Registration"""   
-
+class event_registration(osv.osv):
+    """Event Registration"""
     _name= 'event.registration'
     _description = __doc__
-    _inherit = 'crm.meeting'
+    _inherit = 'mailgate.thread'
+
+    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
+            cur = pricelist and pricelist.currency_id or False
+            res[line.id] = cur and cur_obj.round(cr, uid, cur, price) or price
+        return res
 
     _columns = {
-        'email_cc': fields.text('CC', size=252 , help="These \
-people will receive a copy of the future communication between partner \
-and users by email"), 
-        'nb_register': fields.integer('Number of Registration', readonly=True, states={'draft': [('readonly', False)]}), 
-        'event_id': fields.many2one('event.event', 'Event Related', required=True), 
-        "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced'), 
-        "contact_id": fields.many2one('res.partner.contact', 'Partner Contact'), #TODO: filter only the contacts that have a function into the selected partner_id
-        "unit_price": fields.float('Unit Price'), 
-        "badge_title": fields.char('Badge Title', size=128), 
-        "badge_name": fields.char('Badge Name', size=128), 
-        "badge_partner": fields.char('Badge Partner', size=128), 
-        "event_product": fields.char("Product Name", size=128, required=True), 
-        "tobe_invoiced": fields.boolean("To be Invoiced"), 
-        "invoice_id": fields.many2one("account.invoice", "Invoice", readonly=True), 
-        'date_closed': fields.datetime('Closed', readonly=True), 
-        'ref': fields.reference('Reference', selection=crm._links_get, size=128), 
+        'name': fields.char('Summary', size=124,  readonly=True, states={'draft': [('readonly', False)]}),
+        'email_cc': fields.text('CC', size=252 , readonly=False, states={'done': [('readonly', True)]}, help="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"),
+        'nb_register': fields.integer('Quantity', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Number of Registrations or Tickets"),
+        'event_id': fields.many2one('event.event', 'Event Related', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
+        "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced', readonly=True, states={'draft': [('readonly', False)]}),
+        "contact_id": fields.many2one('res.partner.contact', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id
+        "unit_price": fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Event Price'), readonly=True, states={'draft': [('readonly', False)]}),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Event Price')),
+        "badge_ids": fields.one2many('event.registration.badge', 'registration_id', 'Badges', readonly=False, states={'done': [('readonly', True)]}),
+        "event_product": fields.char("Invoice Name", size=128, readonly=True, states={'draft': [('readonly', False)]}),
+        "tobe_invoiced": fields.boolean("To be Invoiced", readonly=True, states={'draft': [('readonly', False)]}),
+        "invoice_id": fields.many2one("account.invoice", "Invoice", readonly=True),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'ref': fields.reference('Reference', selection=crm._links_get, size=128),
         'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
+        'email_from': fields.char('Email', size=128, states={'done': [('readonly', True)]}, help="These people will receive email."),
+        'create_date': fields.datetime('Creation Date' , readonly=True),
+        'write_date': fields.datetime('Write Date' , readonly=True),
+        'description': fields.text('Description', states={'done': [('readonly', True)]}),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
-        'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
+        'date_deadline': fields.related('event_id','date_end', type='datetime', string="End Date", readonly=True),
+        'date': fields.related('event_id', 'date_begin', type='datetime', string="Start Date", readonly=True),
+        'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
+        'active': fields.boolean('Active'),
+        'section_id': fields.related('event_id', 'section_id', type='many2one', relation='crm.case.section', string='Sale Team', store=True, readonly=True),
+        'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'state': fields.selection([('open', 'Confirmed'),
+                                    ('draft', 'Unconfirmed'),
+                                    ('cancel', 'Cancelled'),
+                                    ('done', 'Done')], 'State', \
+                                    size=16, readonly=True)
     }
     _defaults = {
-        'nb_register': 1, 
-        'tobe_invoiced':  True, 
-        'name': 'Registration', 
-     #   'currency_id': _get_currency,
+        'nb_register': 1,
+        'tobe_invoiced':  True,
+        'state': lambda *a: 'draft', 
+        'active': lambda *a: 1,
+        'user_id': lambda self, cr, uid, ctx: uid,
     }
 
     def _make_invoice(self, cr, uid, reg, lines, context=None):
         """ Create Invoice from Invoice lines
         @param reg : Model of Event Registration
-        @param lines: Ids of Invoice lines 
+        @param lines: Ids of Invoice lines
         """
         if context is None:
             context = {}
         inv_pool = self.pool.get('account.invoice')
         inv_lines_pool = self.pool.get('account.invoice.line')
-        
-        val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)            
+
+        val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
         val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
         partner_address_id = val_invoice['value']['address_invoice_id']
 
         value = inv_lines_pool.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
-        
+
         l = inv_lines_pool.read(cr, uid, lines)
-        
+
         val_invoice['value'].update({
-                'origin': reg.event_product, 
-                'reference': False, 
-                'invoice_line': [(6, 0, lines)], 
-                'comment': "", 
+                'origin': reg.event_product,
+                'reference': False,
+                'invoice_line': [(6, 0, lines)],
+                'comment': "",
                 'date_invoice': context.get('date_inv', False)
             })
-        inv_id = inv_pool.create(cr, uid, val_invoice['value'])   
+        inv_id = inv_pool.create(cr, uid, val_invoice['value'])
         inv_pool.button_compute(cr, uid, [inv_id])
-        self._history(cr, uid, [reg], _('Invoiced'))
+        self.history(cr, uid, [reg], _('Invoiced'))
         return inv_id
 
     def action_invoice_create(self, cr, uid, ids, grouped=False, date_inv = False, context=None):
@@ -290,16 +389,16 @@ and users by email"),
             context['date_inv'] = date_inv
 
         for reg in self.browse(cr, uid, ids, context=context):
-            
+
             val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
-            
+
             val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
             partner_address_id = val_invoice['value']['address_invoice_id']
-                
+
             if not partner_address_id:
                raise osv.except_osv(_('Error !'),
                         _("Registered partner doesn't have an address to make the invoice."))
-                                
+
             value = inv_lines_pool.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
             product = product_pool.browse(cr, uid, reg.event_id.product_id.id, context=context)
             for tax in product.taxes_id:
@@ -308,45 +407,67 @@ and users by email"),
             vals = value['value']
             c_name = reg.contact_id and ('-' + contact_pool.name_get(cr, uid, [reg.contact_id.id])[0][1]) or ''
             vals.update({
-                'name': reg.event_product + '-' + c_name, 
-                'price_unit': reg.unit_price, 
-                'quantity': reg.nb_register, 
-                'product_id':reg.event_id.product_id.id, 
-                'invoice_line_tax_id': [(6, 0, tax_ids)], 
+                'name': reg.event_product + '-' + c_name,
+                'price_unit': reg.unit_price,
+                'quantity': reg.nb_register,
+                'product_id':reg.event_id.product_id.id,
+                'invoice_line_tax_id': [(6, 0, tax_ids)],
             })
             inv_line_ids = self._create_invoice_lines(cr, uid, [reg.id], vals)
             invoices.setdefault(reg.partner_id.id, []).append((reg, inv_line_ids))
-           
+
         for val in invoices.values():
             res = False
             if grouped:
                 res = self._make_invoice(cr, uid, val[0][0], [v for k , v in val], context=context)
-                
+
                 for k , v in val:
-                    self.write(cr, uid, [k.id], {'state': 'done', 'invoice_id': res}, context=context)
-                    
+                    self.do_close(cr, uid, [k.id], context={'invoice_id': res})
+
             else:
                for k , v in val:
                    res = self._make_invoice(cr, uid, k, [v], context=context)
-                   self.write(cr, uid, [k.id], {'state': 'done', 'invoice_id': res}, context=context)
+                   self.do_close(cr, uid, [k.id], context={'invoice_id': res})
             if res: new_invoice_ids.append(res)
-                
+
         return new_invoice_ids
 
+    def do_open(self, cr, uid, ids, context=None):
+        """ Open Registration
+        """
+        res = self.write(cr, uid, ids, {'state': 'open'}, context=context)
+        self.mail_user(cr, uid, ids)
+        self.history(cr, uid, ids, _('Open'))
+        return res
+
+    def do_close(self, cr, uid, ids, context=None):
+        """ Close Registration
+        """
+        if not context:
+            context = {}
+        invoice_id = context.get('invoice_id', False)
+        values = {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')}
+        msg = _('Done')
+        if invoice_id:
+            values['invoice_id'] = invoice_id
+        res = self.write(cr, uid, ids, values)
+        self.history(cr, uid, ids, msg)
+        return res
+
     def check_confirm(self, cr, uid, ids, context=None):
         """This Function Open Event Registration and send email to user.
         @param ids: List of Event registration's IDs
         @param context: A standard dictionary for contextual values
         @return: True
         """
+        if not context:
+            context = {}
         data_pool = self.pool.get('ir.model.data')
         unconfirmed_ids = []
         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:
-                self.write(cr, uid, [registration.id], {'state': 'open'}, context=context)
-                self.mail_user(cr, uid, [registration.id])           
-                self._history(cr, uid, [registration], _('Open')) 
+                self.do_open(cr, uid, [registration.id], context)
             else:
                 unconfirmed_ids.append(registration.id)
         if unconfirmed_ids:
@@ -355,96 +476,99 @@ and users by email"),
             view_id = view_data.res_id
             context['registration_ids'] = unconfirmed_ids
             return {
-                'name': _('Confirm Registration'), 
-                'context': context, 
-                'view_type': 'form', 
-                'view_mode': 'tree,form', 
-                'res_model': 'event.confirm.registration', 
-                'views': [(view_id, 'form')],                     
-                'type': 'ir.actions.act_window', 
-                'target': 'new', 
+                'name': _('Confirm Registration'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'event.confirm.registration',
+                'views': [(view_id, 'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
                 'context': context,
                 'nodestroy': True
             }
-        return True    
-
-    def button_reg_close(self, cr, uid, ids, *args):
-        """This Function Close Event Registration.  
-        """        
-        registrations = self.browse(cr, uid, ids) 
-        self._history(cr, uid, registrations, _('Done'))
-        self.write(cr, uid, ids, {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
-        return True
-    
-    def button_reg_cancel(self, cr, uid, ids, *args):
-        """This Function Cancel Event Registration.
-        """        
-        registrations = self.browse(cr, uid, ids)
-        self._history(cr, uid, registrations, _('Cancel'))
-        self.write(cr, uid, ids, {'state': 'cancel'})
         return True
 
-    def create(self, cr, uid, values, context=None):
-        """ Overrides orm create method.
-        """
-        event_obj = self.pool.get('event.event')
-        event = event_obj.browse(cr, uid, values['event_id'], context=context)
-        values['date_deadline']= event.date_begin
-        values['description']= event.mail_confirm
-        values['currency_id'] =  event.currency_id.id
-        res = super(event_registration, self).create(cr, uid, values, context=context)
-        registrations = self.browse(cr, uid, [res], context=context)
-        self._history(cr, uid, registrations, _('Created'))
-        return res
-
-    def write(self, cr, uid, ids, values, context=None):
-        """ Overrides orm write method.
-        """    
-        event_obj = self.pool.get('event.event')
-        if 'event_id' in values:
-            event = event_obj.browse(cr, uid, values['event_id'], context=context)
-            values['date_deadline']= event.date_begin
-            values['description']= event.mail_confirm
-        return super(event_registration, self).write(cr, uid, ids, values, context=context)
-
-    def mail_user(self, cr, uid, ids, confirm=False, context=None):
-        """
-        Send email to user 
+    def button_reg_close(self, cr, uid, ids, context=None):
+        """This Function Close Event Registration.
         """
         if not context:
             context = {}
-        
-        for reg_id in self.browse(cr, uid, ids):
-            src = reg_id.event_id.reply_to or False
-            dest = []
-            if reg_id.email_from:
-                dest += [reg_id.email_from]
-            if reg_id.email_cc:
-                dest += [reg_id.email_cc]
-            if dest and src:
-                if confirm:
-                   tools.email_send(src, dest, 
-                        _('Auto Confirmation: [%s] %s') %(reg_id.id, reg_id.name),
-                        reg_id.event_id.mail_confirm, 
-                        openobject_id = reg_id.id)
-                elif reg_id.event_id.mail_auto_confirm or reg_id.event_id.mail_auto_registr:
-                    if reg_id.event_id.state in ['draft', 'fixed', 'open', 'confirm', 'running'] and reg_id.event_id.mail_auto_registr:
-                        tools.email_send(src, dest, 
-                            _('Auto Registration: [%s] %s') %(reg_id.id, reg_id.name),
-                             reg_id.event_id.mail_registr, openobject_id = reg_id.id)
-                    if (reg_id.event_id.state in ['confirm', 'running']) and reg_id.event_id.mail_auto_confirm:
-                        tools.email_send(src, dest, 
-                            _('Auto Confirmation: [%s] %s') %(reg_id.id, reg_id.name), 
-                            reg_id.event_id.mail_confirm, openobject_id = reg_id.id)
-                    
-            if not src:
-                raise osv.except_osv(_('Error!'), _('You must define a reply-to address in order to mail the participant. You can do this in the Mailing tab of your event. Note that this is also the place where you can configure your event to not send emails automaticly while registering'))
+        data_pool = self.pool.get('ir.model.data')
+        unclosed_ids = []
+        for registration in self.browse(cr, uid, ids, context=context):
+            if registration.tobe_invoiced and not registration.invoice_id:
+                unclosed_ids.append(registration.id)
+            else:
+                self.do_close(cr, uid, [registration.id])
+        if unclosed_ids:
+            view_id = data_pool._get_id(cr, uid, 'event', 'view_event_make_invoice')
+            view_data = data_pool.browse(cr, uid, view_id)
+            view_id = view_data.res_id
+            context['active_ids'] = unclosed_ids
+            return {
+                'name': _('Close Registration'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'event.make.invoice',
+                'views': [(view_id, 'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'context': context,
+                'nodestroy': True
+            }
+        return True
+
+    def button_reg_cancel(self, cr, uid, ids, *args):
+        """This Function Cancel Event Registration.
+        """
+        registrations = self.browse(cr, uid, ids)
+        self.history(cr, uid, registrations, _('Cancel'))
+        self.write(cr, uid, ids, {'state': 'cancel'})
+        return True    
+
+    def mail_user(self, cr, uid, ids, confirm=False, context=None):
+        """
+        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
+            email_to = []
+            email_cc = []
+            if regestration.email_from:
+                email_to = regestration.email_from
+            if regestration.email_cc:
+                email_cc += [regestration.email_cc]
+            if not (email_to and email_cc):
+                continue
+            subject = ""
+            body = ""
+            if confirm:
+                subject = _('Auto Confirmation: [%s] %s') %(regestration.id, regestration.name)
+                body = regestration.event_id.mail_confirm
+            elif regestration.event_id.mail_auto_confirm or regestration.event_id.mail_auto_registr:
+                if regestration.event_id.state in ['draft', 'fixed', 'open', 'confirm', 'running'] and regestration.event_id.mail_auto_registr:
+                    subject = _('Auto Registration: [%s] %s') %(regestration.id, regestration.name)
+                    body = regestration.event_id.mail_registr
+                if (regestration.event_id.state in ['confirm', 'running']) and regestration.event_id.mail_auto_confirm:
+                    subject = _('Auto Confirmation: [%s] %s') %(regestration.id, regestration.name)
+                    body = regestration.event_id.mail_confirm
+            if subject or body:
+                tools.email_send(src, email_to, subject, body, email_cc = email_cc, openobject_id = regestration.id)
+                self.history(cr, uid, [regestration], subject, history=True, \
+                        email=email_to, details=body, \
+                        subject=subject, email_from=src, \
+                        email_cc=', '.join(email_cc))
 
         return True
 
     def mail_user_confirm(self, cr, uid, ids, context=None):
         """
-        Send email to user 
+        Send email to user
         """
         return self.mail_user(cr, uid, ids, confirm=True, context=context)
 
@@ -453,30 +577,15 @@ and users by email"),
         """
         return self.pool.get('account.invoice.line').create(cr, uid, vals)
 
-    def onchange_badge_name(self, cr, uid, ids, badge_name):
-        """This function returns value of Registration Name based on Partner Badge Name.
-        @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 Registration IDs
-        @param badge_name: Badge Name 
-        """
-        
-        data ={}
-        if not badge_name:
-            return data
-        data['name'] = 'Registration: ' + badge_name
-        return {'value': data}
-
     def onchange_contact_id(self, cr, uid, ids, contact, partner):
-        
+
         """This function returns value of Badge Name , Badge Title based on Partner contact.
         @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 Registration IDs
         @param contact: Patner Contact IDS
-        @param partner: Partner IDS 
+        @param partner: Partner IDS
         """
         data ={}
         if not contact:
@@ -484,17 +593,13 @@ and users by email"),
         contact_obj = self.pool.get('res.partner.contact')
         addr_obj = self.pool.get('res.partner.address')
         job_obj = self.pool.get('res.partner.job')
-        
+
         contact_id = contact_obj.browse(cr, uid, contact)
-        data['badge_name'] = contact_id.name
-        data['badge_title'] = contact_id.title.name
         if partner:
             partner_addresses = addr_obj.search(cr, uid, [('partner_id', '=', partner)])
             job_ids = job_obj.search(cr, uid, [('contact_id', '=', contact), ('address_id', 'in', partner_addresses)])
             if job_ids:
                 data['email_from'] = job_obj.browse(cr, uid, job_ids[0]).email
-        d = self.onchange_badge_name(cr, uid, ids, data['badge_name'])
-        data.update(d['value'])
         return {'value': data}
 
     def onchange_event(self, cr, uid, ids, event_id, partner_invoice_id):
@@ -504,31 +609,33 @@ and users by email"),
         @param uid: the current user’s ID for security checks,
         @param ids: List of Registration IDs
         @param event_id: Event ID
-        @param partner_invoice_id: Partner Invoice ID 
+        @param partner_invoice_id: Partner Invoice ID
         """
         context={}
         if not event_id:
             return {'value': {'unit_price': False, 'event_product': False}}
-        
+
         event_obj = self.pool.get('event.event')
         prod_obj = self.pool.get('product.product')
-        res_obj = self.pool.get('res.partner')
-        
-        data_event =  event_obj.browse(cr, uid, event_id)
-        context['currency_id'] = data_event.currency_id.id
-        if data_event.user_id.id:
-            return {'value': {'user_id':data_event.user_id.id}}
+        res_obj = self.pool.get('res.partner') 
 
+        data_event =  event_obj.browse(cr, uid, event_id)
+        res = {'value': {'unit_price': False, 'event_product': False, 'user_id': False, 
+                        'date': data_event.date_begin, 'date_deadline': data_event.date_end, 'description': data_event.note, 'name': data_event.name,
+                        'section_id': data_event.section_id and data_event.section_id.id or False,
+                        }}
+        if data_event.user_id.id:
+            res['value'].update({'user_id':data_event.user_id.id})
         if data_event.product_id:
-            if not partner_invoice_id:
-                unit_price=prod_obj.price_get(cr, uid, [data_event.product_id.id], context=context)[data_event.product_id.id]
-                return {'value': {'unit_price': unit_price, 'event_product': data_event.product_id.name, 'currency_id': data_event.currency_id.id}}
-            data_partner = res_obj.browse(cr, uid, partner_invoice_id)
-            context.update({'partner_id': data_partner})
-            unit_price = prod_obj._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': data_partner.property_product_pricelist.id})[data_event.product_id.id]
-            return {'value': {'unit_price': unit_price, 'event_product': data_event.product_id.name, 'currency_id': data_event.currency_id.id}}
-        
-        return {'value': {'unit_price': False, 'event_product': False}}
+            pricelist_id = data_event.pricelist_id and data_event.pricelist_id.id or False
+            if partner_invoice_id:
+                partner = res_obj.browse(cr, uid, partner_invoice_id, context=context)
+                pricelist_id = pricelist_id or partner.property_product_pricelist.id
+            unit_price = prod_obj._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': pricelist_id})[data_event.product_id.id]
+            if not unit_price:
+                unit_price = data_event.unit_price
+            res['value'].update({'unit_price': unit_price, 'event_product': data_event.product_id.name})
+        return res
 
     def onchange_partner_id(self, cr, uid, ids, part, event_id, email=False):
         """This function returns value of Patner Invoice id, Unit Price, badget title based on partner and Event.
@@ -541,9 +648,9 @@ and users by email"),
         """
         job_obj = self.pool.get('res.partner.job')
         res_obj = self.pool.get('res.partner')
-        
-        data={}
-        data['badge_partner'] = data['contact_id'] = data['partner_invoice_id'] = data['email_from'] = data['badge_title'] = data['badge_name'] = False
+
+        data = {}
+        data['contact_id'], data['partner_invoice_id'], data['email_from'] = (False, False, False)
         if not part:
             return {'value': data}
         data['partner_invoice_id']=part
@@ -560,8 +667,6 @@ and users by email"),
                     d = self.onchange_contact_id(cr, uid, ids, data['contact_id'], part)
                     data.update(d['value'])
         partner_data = res_obj.browse(cr, uid, part)
-        data['badge_partner'] = partner_data.name
-        
         return {'value': data}
 
     def onchange_partner_invoice_id(self, cr, uid, ids, event_id, partner_invoice_id):
@@ -578,23 +683,35 @@ and users by email"),
         event_obj = self.pool.get('event.event')
         prod_obj = self.pool.get('product.product')
         res_obj = self.pool.get('res.partner')
-        
+
         data['unit_price']=False
         if not event_id:
             return {'value': data}
         data_event =  event_obj.browse(cr, uid, event_id)
         if data_event.product_id:
-            data['event_product']=data_event.product_id.name
-            if not partner_invoice_id:
-                data['unit_price']=prod_obj.price_get(cr, uid, [data_event.product_id.id], context=context)[data_event.product_id.id]
-                return {'value': data}
-            data_partner = res_obj.browse(cr, uid, partner_invoice_id)
-            context.update({'partner_id': data_partner})
-            data['unit_price'] = prod_obj._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': data_partner.property_product_pricelist.id})[data_event.product_id.id]
-            return {'value': data}
+            data['event_product'] = data_event.product_id.name
+            pricelist_id = data_event.pricelist_id and data_event.pricelist_id.id or False
+            if partner_invoice_id:
+                partner = res_obj.browse(cr, uid, partner_invoice_id, context=context)
+                pricelist_id = pricelist_id or partner.property_product_pricelist.id
+            unit_price = prod_obj._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': pricelist_id})[data_event.product_id.id]
+            if not unit_price:
+                unit_price = data_event.unit_price
+            data['unit_price'] = unit_price
         return {'value': data}
 
 event_registration()
 
+class event_registration_badge(osv.osv):
+    _name = 'event.registration.badge'
+    _description = __doc__
+    _columns = {
+        'registration_id': fields.many2one('event.registration', 'Registration', required=True),
+        "title": fields.char('Title', size=128),
+        "name": fields.char('Name', size=128, required=True),
+        "address_id": fields.many2one('res.partner.address', 'Address'),
+    }
+event_registration_badge()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml
deleted file mode 100644
index ebfe70e4c50..00000000000
--- a/addons/event/event_data.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-
-	</data>
-</openerp>
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 88927cd0f25..3bf58691c0f 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -55,54 +55,30 @@
 <!-- Demo data for Event -->
 	<record id="event_0" model="event.event">
 		<field name="name">Concert of Bon Jovi</field>
-		<field name="date_begin">2008-01-01 19:00:00</field>
-		<field name="date_end">2008-01-01 23:00:00</field>
+        <field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
+        <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
 		<field name="product_id" ref="event_product_0"/>
 		<field name="unit_price">68.00</field>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="register_max">500</field>
 		<field name="type" ref="event_type_1"/>
-		<field name="state">draft</field>
-	</record>
-<!--
-	<record id="demo_event_0bis" model="event.event">
-		<field name="name">Concert of Bon Jovi - Brussel</field>
-		<field name="date_begin">2008-02-02 19:00:00</field>
-		<field name="date_end">2008-02-02 23:00:00</field>
-		<field name="product_id" ref="event_product_0"/>
-		<field name="parent_id" ref="event_0"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="register_max">500</field>
-		<field name="type" ref="event_type_1"/>
 	</record>
 
-	<record id="demo_event_0ter" model="event.event">
-		<field name="name">Concert of Bon Jovi - London</field>
-		<field name="date_begin">2008-04-04 19:00:00</field>
-		<field name="date_end">2008-04-04 23:00:00</field>
-		<field name="product_id" ref="event_product_0"/>
-		<field name="parent_id" ref="event_0"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="register_max">500</field>
-		<field name="type" ref="event_type_1"/>
-	</record>
--->
 	<record id="event_1" model="event.event">
 		<field name="name">Opera of Verdi</field>
-		<field name="date_begin">2008-03-05 18:00:00</field>
-		<field name="date_end">2008-03-05 21:00:00</field>
+        <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date_begin"/>
+        <field eval="time.strftime('%Y-%m-05 21:00:00')" name="date_end"/>
 		<field name="product_id" ref="event_product_1"/>
 		<field name="unit_price">24.00</field>
 		<field name="type" ref="event_type_1"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="register_max">350</field>
-		<field name="state">confirm</field>
 	</record>
-
+    <function model="event.event" name="button_confirm" eval="[ref('event_1')]"/>
 	<record id="event_2" model="event.event">
 		<field name="name">Conference on ERP Buisness</field>
-		<field name="date_begin">2008-09-09 14:00:00</field>
-		<field name="date_end">2008-09-09 16:30:00</field>
+        <field eval="time.strftime('%Y-%m-05 14:00:00')" name="date_begin"/>
+        <field eval="time.strftime('%Y-%m-05 16:30:00')" name="date_end"/>
 		<field name="product_id" ref="event_product_2"/>
 		<field name="unit_price">15.50</field>
 		<field name="type" ref="event_type_2"/>
@@ -110,10 +86,10 @@
 		<field name="user_id" ref="base.user_root"/>
 		<field name="mail_auto_registr">True</field>
 		<field name="mail_auto_confirm">True</field>
-		<field name="state">done</field>
 		<field name="mail_registr">Thanks for registrering. We will keep you informed of the modalities.</field>
 		<field name="mail_confirm">Thanks for registrering. The conference will begin at 2 PM and will be given by Mister Pinckaers.</field>
 	</record>
-
+    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
+    <function model="event.event" name="button_done" eval="[ref('event_2')]"/>
 	</data>
 </openerp>
diff --git a/addons/event/event_sequence.xml b/addons/event/event_sequence.xml
deleted file mode 100644
index eb8d45137cf..00000000000
--- a/addons/event/event_sequence.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data>
-
-    #
-    # Sequences for crm.case.section
-    #
-
-    <record model="ir.sequence.type" id="seq_section_code">
-        <field name="name">Section Code</field>
-        <field name="code">event.event</field>
-    </record>
-    <record model="ir.sequence" id="seq_section_code1">
-        <field name="name">Section Code</field>
-        <field name="code">event.event</field>
-        <field name="prefix">C/</field>
-        <field name="padding">3</field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 9caaae6e722..099457acfd6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" sequence="9"/>
-        <menuitem name="Events Organisation" id="menu_event_main" parent="menu_marketing_event_main" />
-        
+        <!--menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
+        <menuitem name="Events Organisation" id="menu_event_main" parent="base.menu_association" /-->
+        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"/>
+        <menuitem name="Events Organisation" id="base.menu_event_main" parent="base.marketing_menu" />
+
     <!-- EVENTS  -->
 
     <!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
@@ -33,8 +35,8 @@
             <field name="res_model">event.type</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem name="Configuration" id="menu_event_config" parent="menu_marketing_event_main" sequence="30" groups="base.group_extended"/>
-        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config" groups="base.group_extended,crm.group_crm_manager"/>
+        <menuitem name="Configuration" id="base.menu_event_config" parent="base.marketing_menu" sequence="30" groups="base.group_extended"/>
+        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_event_config" groups="base.group_extended,crm.group_crm_manager"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
@@ -45,31 +47,35 @@
             <field name="arch" type="xml">
                 <form string="Events">
                     <group col="6" colspan="4">
-                        <field name="name" string="Event" select="1"/>
-                        <field name="type" widget="selection"/>
-                        <field name="user_id" select="1"/>
-                        <field name="date_begin" select="1"/>
+                        <field name="name"/>
+                        <field name="date_begin"/>
                         <field name="date_end"/>
-                        <field name="product_id" on_change="onchange_product(product_id)"/>
+                        <field name="type" widget="selection"/>
+                        <field name="language"/>
+                        <field name="parent_id"/>
                     </group>
                     <notebook colspan="4">
-                    <page string="Event Information">
+                    <page string="Event">
+                        <group colspan="4" col="4">                            
+                            <separator string="Invoice Information" colspan="4"/>
+                            <field name="product_id" on_change="onchange_product(product_id)" colspan="4"/>
+                            <field name="unit_price"/>
+                            <field name="pricelist_id" domain="[('type','=','sale')]" groups="base.group_extended"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Contact" colspan="4"/>
+                            <field name="user_id"/>
+                            <field name="section_id" widget="selection" on_change="do_team_change(section_id)"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Location" colspan="4"/>
+                            <field name="country_id" />
+                            <field name="address_id" domain="[('country_id','=',country_id)]"/>
+
+                        </group>
                         <separator string="Description" colspan="4"/>
-                        <field name="unit_price"/>
-                        <field name="currency_id"/>
-                        <field name="register_min"/>
-                        <field name="register_max"/>
-                        <field name="parent_id" domain="[('parent_id','child_of','Event')]"/>
-                        <field name="active"/>
-                        <separator string="Location" colspan="4"/>
-                        <field name="country_id" />
-                        <field name="language"/>
-                        <field name="address_id"/>
-                        <separator string="Speaker Information" colspan="4"/>
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
-                        <field name="speaker_confirmed"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4"/>
-                        <newline/>
+                        <field name="note" colspan="4" nolabel="1"/>
                         <field name="state" select="1"/>
                         <group col="4" colspan="2">
                            <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
@@ -78,42 +84,81 @@
                            <button string="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
-                   <page string="Mailing">
-                        <field name="reply_to" />
-                        <newline/>
-
-                        <group col="3" colspan="2" expand="1">
-                            <separator string="Auto Registration Email" colspan="2"/>
-                            <newline/>
-                            <field name="mail_auto_registr"/>
-                            <separator string="Registration Email" colspan="2"/>
-                            <newline/>
-                            <field name="mail_registr" colspan="2"  nolabel="1"/>
-                        </group>
-                        <group col="2" colspan="2" >
-                            <separator string="Auto Confirmation Email" colspan="2"/>
-                            <field name="mail_auto_confirm"/>
-                            <newline/>
-                            <separator string="Confirmation Email" colspan="2"/>
-                            <field name="mail_confirm" colspan="2" nolabel="1"/>
-                        </group>
+                    <page string="Speakers">
+                        <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
+                        <field name="speaker_confirmed"/>
+                        <separator string="Other Speakers" colspan="4"/>
+                        <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Statistics">
-                        <separator string="Registrations" colspan="4"/>
+                    <page string="Registrations">
+                        <field name="register_min"/>
+                        <field name="register_max"/>
                         <field name="register_current"/>
                         <field name="register_prospect"/>
+                        <field name="registration_ids" colspan="4" nolabel="1" readonly="1">
+                            <form string="Registration">
+                                <field name="name"/>
+                                <field name="date" string="Date"/>
+                                <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id,event_id)"/>
+                                <field name="partner_invoice_id" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
+                                <group colspan="4" col="4">
+                                    <field name="event_product"/>
+                                    <field name="nb_register"/>
+                                    <field name="unit_price"/>
+                                    <field name="price_subtotal"/>
+                                </group>
+                                <group col="8" colspan="4">
+                                    <separator string="" colspan="4"/>
+                                    <newline/>
+                                    <field name="state" select="1" colspan="2"/>
+                                    <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
+                                    <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                </group>
+                            </form>
+                            <tree string="Registration">
+                                    <field name="create_date" string="Registration Date"/>
+                                    <field name="partner_id" required="1" string="Partner" on_change="onchange_partner_id(partner_id,event_id)"/>
+                                    <field name="event_product"/>
+                                    <field name="nb_register"/>
+                                    <field name="unit_price"/>
+                                    <field name="price_subtotal"/>
+                                    <field name="state"/>
+                                    <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
+                                    <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                            </tree>
+                        </field>
                     </page>
-                    <page string="Notes">
-                        <separator string="Notes" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
+                    <page string="Mailing">
+                        <field name="reply_to" />
+                        <newline/>
+                        <group col="4" colspan="4">
+                            <group col="2" colspan="2">
+                                <separator string="Auto Registration Email" colspan="4"/>
+                                <field name="mail_auto_registr" colspan="4"/>
+                                <group colspan="4" attrs="{'readonly':[('mail_auto_registr','=',False)]}">
+                                    <separator string="Registration Email Body" colspan="4"/>
+                                    <field name="mail_registr" colspan="4" nolabel="1" />
+                                </group>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Auto Confirmation Email" colspan="4"/>
+                                <field name="mail_auto_confirm" colspan="4"/>
+                                <group colspan="4" attrs="{'readonly':[('mail_auto_confirm','=',False)]}">
+                                    <separator string="Confirmation Email Body" colspan="4"/>
+                                    <field name="mail_confirm" nolabel="1" colspan="4"/>
+                                </group>
+                            </group>
+                        </group>
+                    </page>                   
                     </notebook>
             </form>
             </field>
         </record>
 
         <!-- Event tree view -->
-        
+
         <record model="ir.ui.view" id="view_event_tree">
             <field name="name">event.event.tree</field>
             <field name="model">event.event</field>
@@ -129,12 +174,16 @@
                     <field name="register_min"/>
                     <field name="register_current"/>
                     <field name="state"/>
+                    <button string="Confirm Event" help="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Cancel Event" help="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Event Done" help="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" help="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object" icon="gtk-convert"/>
                 </tree>
             </field>
         </record>
-        
-      <!-- Events  Calendar  View -->  
-        
+
+      <!-- Events  Calendar  View -->
+
         <record id="view_event_calendar" model="ir.ui.view">
             <field name="name">event.event.calendar</field>
             <field name="model">event.event</field>
@@ -147,9 +196,9 @@
                 </calendar>
             </field>
         </record>
-        
+
         <!-- Event Graph view -->
-        
+
         <record model="ir.ui.view" id="view_event_graph">
             <field name="name">Event Graph</field>
             <field name="model">event.event</field>
@@ -189,7 +238,7 @@
                     <group expand="0" string="Group By..." colspan="4" col="12">
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
                         <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/> 
+                        <separator orientation="vertical"/>
                         <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Creation" icon="terp-go-month"
@@ -200,7 +249,7 @@
         </record>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS  -->
-    
+
        <record model="ir.actions.act_window" id="action_event_view">
            <field name="name">Events</field>
            <field name="type">ir.actions.act_window</field>
@@ -210,7 +259,7 @@
            <field name="context">{"search_default_draft": "1"}</field>
            <field name="search_view_id" ref="view_event_search"/>
        </record>
-       
+
       <act_window
             id="act_event_list_register_event"
             name="Registration"
@@ -219,7 +268,7 @@
             view_mode="tree,form,calendar,graph"
             domain="[('event_id', '=', active_id)]"
             view_type="form"/>
-            
+
       <act_window
             id="act_register_event_partner"
             name="Subscribe"
@@ -227,26 +276,28 @@
             src_model="res.partner"
             view_mode="tree,form,calendar,graph"
             domain="[('partner_id', '=', active_id)]"
-            view_type="form"/>       
+            view_type="form"/>
 
-       <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />
+       <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
 
     <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
-        <!-- Registration view (form) by _inherits  .................. -->
-        
+
         <record model="ir.ui.view" id="view_event_registration_tree">
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Registration">
-                    <field name="id"/>
-                    <field name="create_date"/>
+                    <field name="date" string="Date"/>
                     <field name="event_id"/>
                     <field name="partner_id"/>
                     <field name="nb_register"/>
+                    <field name="price_subtotal"/>
                     <field name="state"/>
+                    <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
+                    <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
@@ -258,56 +309,86 @@
             <field name="arch" type="xml">
                 <form string="Registration">
                     <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="2"/>
-                        <field name="event_id" select="1" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="user_id" select="1"/>
-                        <newline/>
-                        <field name="partner_id" required="1" select="1" on_change="onchange_partner_id(partner_id,event_id)" />
-                        <field name="partner_invoice_id" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
+                        <field name="event_id" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
+                        <field name="create_date" string="Registration Date"/>
+                        <field name="name"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id,event_id)" />
+                        <field name="user_id"/>
+                        <field name="tobe_invoiced"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="General">
-                           <group colspan="4" col="6">
+                        <page string="Registration">
+                            <field name="date" />
+                            <field name="date_deadline" />
+                            <group colspan="2" col="2">
+                                <separator string="Registration Cost" colspan="4"/>
                                 <field name="nb_register"/>
                                 <field name="unit_price"/>
-                                <field name="currency_id"/>
+                                <field name="price_subtotal"/>
                             </group>
-                            <separator string="Communication Information" colspan="4"/>
-                            <field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" />
-                            <field name="email_from"/>
-                            <newline/>
-                            <separator string="Badge" colspan="4"/>
-                            <field name="badge_title"/>
-                            <field name="badge_name" on_change="onchange_badge_name(badge_name)"/>
-                            <field name="badge_partner"/>
-                            <newline/>
-                            <group col="8" colspan="4">
-                                <separator string="Status" colspan="4"/>
-                                <newline/>
+                            <group colspan="2" col="2" attrs="{'invisible':[('tobe_invoiced','=',False)]}">
+                                <separator string="Invoice" colspan="4"/>
+                                <field name="event_product" attrs="{'required':[('tobe_invoiced','=',True)]}"/>
+                                <field name="partner_invoice_id" attrs="{'required':[('tobe_invoiced','=',True)]}" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
+                                <field name="invoice_id"/>                                
+                           </group>
+                            <separator string="Description" colspan="4"/>
+                            <field name="description" colspan="4" nolabel="1"/>
+                            <separator string="" colspan="4"/>
+                            <group col="8" colspan="4">                                
                                 <field name="state" select="1" colspan="2"/>
                                 <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
                                 <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                                 <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
-                        <page string="Payments">
-                            <field name="event_product" select="1"/>
-                            <field name="tobe_invoiced" select="1"/>
-                            <field name="invoice_id"/>
+                        <page string="Extra Info">
+                            <separator string="Contact" colspan="4"/>
+                            <field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" />
+                            <field name="email_from"/>
+                            <field name="badge_ids" colspan="4" nolabel="1">
+                                <tree string="Badges" editable="bottom">
+                                    <field name="name"/>
+                                    <field name="title"/>
+                                    <field name="address_id"/>
+                                </tree>
+                                <form string="Badges">
+                                    <field name="name"/>
+                                    <field name="title"/>
+                                    <field name="address_id"/>
+                                </form>
+                            </field>
+                            <group col="2" colspan="2" groups="base.group_extended">
+                               <separator string="Dates" colspan="2"/>                               
+                               <field name="date_closed"/>
+                            </group>
+                            <group col="2" colspan="2" groups="base.group_extended">
+                               <separator string="Misc" colspan="2"/>
+                               <field name="id"/>
+                               <field name="active"/>
+                            </group>
                         </page>
                         <page string="Emails" groups="base.group_extended">
                             <group colspan="4">
                                  <field colspan="4" name="email_cc" string="CC" widget="char" size="512"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                                <tree string="Communication history">
+                                    <field name="display_text" string="History Information"/>
+                                    <button
+                                        string="Reply"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
+                                        icon="terp-mail-replied" type="action" />
+                                </tree>
                                 <form string="Communication history">
-		                            <group col="4" colspan="4">
-		                                <field name="email_from"/>
-		                                <field name="date"/>
-		                                <field name="email_to" widget="char" size="512"/>
-		                                <field name="email_cc" widget="char" size="512"/>
-		                                <field name="name" colspan="4" widget="char" size="512"/>
-		                            </group>
+                                    <group col="4" colspan="4">
+                                        <field name="email_from"/>
+                                        <field name="date"/>
+                                        <field name="email_to" widget="char" size="512"/>
+                                        <field name="email_cc" widget="char" size="512"/>
+                                        <field name="name" colspan="4" widget="char" size="512"/>
+                                    </group>
                                     <notebook colspan="4">
                                         <page string="Details">
                                             <field name="description" colspan="4" nolabel="1"/>
@@ -317,69 +398,37 @@
                                         </page>
                                     </notebook>
                                     <button colspan="4"
-                                    string="Reply to Last Email"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
-                                    icon="gtk-undo" type="action" />
+                                        string="Reply"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
+                                        icon="terp-mail-replied" type="action" />
                                 </form>
-                                <tree string="Communication history">
-                                    <field name="date"/>
-                                    <field name="email_from" />
-                                    <field name="email_to"/>
-                                    <field name="description"/>
-                                </tree>
-                               </field>
+                            </field>
                               <button colspan="4" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'event.registration'}"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-message-new" type="action" />
                            </page>
-                           <page string="History">
-                                <group col="2" colspan="2">
-                                   <separator string="Dates" colspan="2"/>
-                                   <field name="create_date"/>
-                                   <field name="date_closed"/>
-                                </group>
-                                <group col="2" colspan="2">
-                                   <separator string="Misc" colspan="2"/>
-                                   <field name="id"/>
-                                   <field name="active"/>
-                                </group>
-                                <!-- TODO-->
-                               <field name="log_ids" nolabel="1" colspan="4">
-                                    <tree string="Logs">
-                                        <field name="name" colspan="4"/>
-                                        <field name="date"/>
-                                        <field name="user_id"/>
-                                    </tree>
-                                    <form string="Logs">
-                                        <separator string="Action Information" colspan="4"/>
-                                        <field name="name" colspan="4"/>
-                                        <field name="date"/>
-                                        <field name="user_id"/>
-                                    </form>
-                                </field>
-                            </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        
- <!-- Calendar view of event registration -->       
-        
+
+ <!-- Calendar view of event registration -->
+
         <record id="view_event_registration_calendar" model="ir.ui.view">
             <field name="name">event.registration.calendar</field>
             <field name="model">event.registration</field>
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="event_id" date_start="create_date" string="Event Registration">
+                <calendar color="event_id" date_start="date" date_delay="duration" string="Event Registration">
                     <field name="event_id"/>
                     <field name="partner_invoice_id"/>
                 </calendar>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_event_registration_graph">
             <field name="name">Registration Graph</field>
             <field name="model">event.registration</field>
@@ -391,7 +440,7 @@
                 </graph>
             </field>
         </record>
-        
+
 
 <!-- Search view of event registration form-->
 
@@ -408,7 +457,7 @@
                         <field name="partner_id" />
                         <field name="event_id" widget="selection"/>
                         <field name="state" select="1"/>
-                        
+
                         <field name="user_id" widget="selection">
                               <filter icon="terp-personal"
                                     string="My Registration"
@@ -416,12 +465,12 @@
                                     domain="[('user_id','=',uid)]"/>
                         </field>
                     </group>
-                    <newline/>    
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>                        
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    </group>
                 </search>
@@ -437,11 +486,11 @@
           <field name="context">{"search_default_draft": "1"}</field>
           <field name="search_view_id" ref="view_registration_search"/>
         </record>
-        
+
         <menuitem
             name="Registrations"
-            id="menu_action_registration" parent="menu_event_main"
+            id="menu_action_registration" parent="base.menu_event_main"
             action="action_registration"/>
-        <menuitem name="Reporting" id="menu_report_event" parent="menu_marketing_event_main" sequence="20"/>
+        <menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu" sequence="20"/>
     </data>
 </openerp>
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po
index 7e33c522425..cf3807b9768 100644
--- a/addons/event/i18n/zh_CN.po
+++ b/addons/event/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:22+0000\n"
+"PO-Revision-Date: 2010-07-20 08:56+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-06-22 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
@@ -30,7 +30,7 @@ msgstr "最小记录"
 #. module: event
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: event
 #: field:event.event,mail_registr:0
@@ -45,12 +45,12 @@ msgstr "Bon Jovi音乐会"
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr "确认邮件"
+msgstr "确认Email"
 
 #. module: event
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr "错误！你不能创建递归的项"
+msgstr "错误! 你不能创建递归的部分"
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration
@@ -60,7 +60,7 @@ msgstr "事件记录"
 #. module: event
 #: model:ir.actions.wizard,name:event.event_reg_invoice
 msgid "Make Invoice"
-msgstr "创建发票"
+msgstr "生成发票"
 
 #. module: event
 #: field:report.event.type.registration,draft_state:0
@@ -131,10 +131,13 @@ msgid ""
 "                Events / Reporting\n"
 msgstr ""
 "组织和事件管理\n"
-"这模块允许你\n"
-"* 管理你的事务\n"
-"* 使用电子邮件自动确认和发送致谢到登记的每个事务\n"
+"  这模块允许你\n"
+"    * 管理你的事务和它的记录\n"
+"    * 使用电子邮件自动确认和发送确认登记的每个事务\n"
 "....\n"
+"  注意:\n"
+"    - 你能在事件/ 设置/ 事件类型, 中定义新类型的事件\n"
+"    - 你能在事件/ 报表, 中访问到与定义的报表\n"
 
 #. module: event
 #: view:event.registration:0
@@ -163,7 +166,7 @@ msgstr "事件"
 #. module: event
 #: selection:event.event,state:0
 msgid "Confirmed"
-msgstr "确认"
+msgstr "已确认"
 
 #. module: event
 #: wizard_view:event.confirm_registration,split:0
@@ -195,12 +198,12 @@ msgstr "标志"
 #. module: event
 #: field:event.event,section_id:0
 msgid "Case section"
-msgstr "业务个案项"
+msgstr "划分的业务个案"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
 msgid "To be Invoiced"
-msgstr "开发票"
+msgstr "待开票"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_event
@@ -210,7 +213,7 @@ msgstr "所有事件"
 #. module: event
 #: model:ir.ui.menu,name:event.menu_report_event
 msgid "Reporting"
-msgstr "内部报表"
+msgstr "报表"
 
 #. module: event
 #: view:event.registration:0
@@ -225,7 +228,7 @@ msgstr "事件分类"
 #. module: event
 #: wizard_view:event.confirm_registration,split:0
 msgid "The event limit is reached. What do you want to do?"
-msgstr "这事件到达限制.你想要怎么做?"
+msgstr "事件到达限制. 你想要怎么做?"
 
 #. module: event
 #: field:report.event.type.registration,confirm_state:0
@@ -252,12 +255,12 @@ msgstr "设置"
 #. module: event
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: event
 #: wizard_button:event.confirm_registration,split,confirm:0
 msgid "Confirm Anyway"
-msgstr "无论如何确认"
+msgstr "总是确认"
 
 #. module: event
 #: constraint:product.template:0
@@ -267,7 +270,7 @@ msgstr "错误:销售单位必须和计量单位在不同的分类."
 #. module: event
 #: view:event.event:0
 msgid "Parent Category"
-msgstr "业务伙伴分类"
+msgstr "上级分类"
 
 #. module: event
 #: view:event.registration:0
@@ -287,7 +290,7 @@ msgstr "取消事件"
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0
 msgid "Error Messages"
-msgstr "错误信息"
+msgstr "错误消息"
 
 #. module: event
 #: view:event.event:0
@@ -297,7 +300,7 @@ msgstr "邮递"
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
 msgid "Ticket for Concert"
-msgstr "音乐会门票"
+msgstr "演唱会票"
 
 #. module: event
 #: field:event.event,register_prospect:0
@@ -309,7 +312,7 @@ msgstr "不确认记录"
 #. module: event
 #: field:event.registration,partner_invoice_id:0
 msgid "Partner Invoiced"
-msgstr "业务伙伴发票"
+msgstr "已开票业务伙伴"
 
 #. module: event
 #: view:event.registration:0
@@ -319,7 +322,7 @@ msgstr "沟通日志"
 #. module: event
 #: selection:event.event,state:0
 msgid "Canceled"
-msgstr "取消"
+msgstr "已取消"
 
 #. module: event
 #: view:event.event:0
@@ -341,7 +344,7 @@ msgstr "记录的事件"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
+msgstr "错误:默认的计量单位和采购的计量单位必须是同一类型."
 
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_created:0
@@ -372,12 +375,12 @@ msgstr "记录的事件类型"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: event
 #: field:event.registration,event_id:0
 msgid "Event Related"
-msgstr "有关事件"
+msgstr "关联的事件"
 
 #. module: event
 #: model:crm.case.section,name:event.case_section_event
@@ -412,7 +415,7 @@ msgstr "所有记录"
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use the automatic mailing for new registration"
-msgstr "如果你使用自动邮递一个新记录"
+msgstr "勾选此项, 如果你使用自动邮递一个新记录"
 
 #. module: event
 #: view:event.event:0
@@ -439,7 +442,7 @@ msgstr "事件类型"
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr "业务伙伴联系人"
+msgstr "业务伙伴联系方式"
 
 #. module: event
 #: view:event.event:0
@@ -450,7 +453,7 @@ msgstr "自动确认邮件"
 #: view:event.event:0
 #: view:event.registration:0
 msgid "General"
-msgstr "一般"
+msgstr "通用"
 
 #. module: event
 #: view:event.registration:0
@@ -507,7 +510,7 @@ msgstr "单价"
 #. module: event
 #: model:crm.case.section,name:event.event_2_crm_case_section
 msgid "Conference on ERP Buisness"
-msgstr "ERP Buisness会议"
+msgstr "商业会议"
 
 #. module: event
 #: field:event.registration,badge_partner:0
@@ -534,7 +537,7 @@ msgstr "类型"
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
-msgstr "有人赞同确认事件将发送这邮件"
+msgstr "有人赞同事件将发送这邮件"
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
@@ -556,7 +559,7 @@ msgstr "名称"
 msgid ""
 "Check this box if you want ot use the automatic confirmation emailing or the "
 "reminder"
-msgstr "如果你使用自动邮件确认或提醒"
+msgstr "勾选此项, 如果你使用自动邮件确认或提醒"
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -564,7 +567,7 @@ msgid ""
 "This email will be sent when the event gets confimed or when someone "
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
-msgstr "当有人确认这事件或赞同这确认时这邮件将被发送以提醒有关人等"
+msgstr "当有人确认这事件或赞同这确认事件时, 这邮件将发送以提醒有关人员"
 
 #. module: event
 #: field:event.event,product_id:0
@@ -603,7 +606,7 @@ msgstr "事件草稿"
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_main
 msgid "Events Organisation"
-msgstr "事件系统"
+msgstr "事件组织"
 
 #. module: event
 #: view:event.registration:0
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 9af9347a76d..f74b7d31567 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -51,6 +51,7 @@ class report_event_registration(osv.osv):
         initialize the sql view for the event registration
         cr -- the cursor
         """
+        tools.drop_view_if_exists(cr, 'report_event_registration')
         cr.execute("""
          create or replace view report_event_registration as (
                 select
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 9e00040fa97..f6af4429ad5 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -7,7 +7,7 @@
             <field name="model">report.event.registration</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Event on Registration">
+                <tree colors="blue:state in ('draft');black:state in ('confirm','approved');gray:state in('done','cancel')" string="Event on Registration">
                     <field name="date" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="speaker_id" invisible="1"/>
@@ -124,7 +124,7 @@
        </record>
 
         <!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
-        <menuitem parent="menu_report_event" action="action_report_event_registration" id="menu_report_event_registration" />
+        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3"/>
  
     <!-- end...  -->
     </data>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 0b6ace47b19..2fafec3e2ef 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -30,9 +30,16 @@
                     </field>
                     <field name="event_registration_ids" colspan="4" nolabel="1">
                         <tree string="Events Registration">
+                            <field name="date" string="Date"/>
                             <field name="event_id" />
-                            <field name="partner_id"/>
+                            <field name="partner_invoice_id"/>
+                            <field name="nb_register"/>
                             <field name="unit_price"/>
+                            <field name="price_subtotal"/>
+                            <field name="state"/>
+                            <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
+                            <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                         </tree>
                     </field>
                 </page>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index 6cf4adeb5b9..4f29fc90837 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="0">
+	<data>
 	
 	
     <record id="group_event_manager" model="res.groups">
@@ -10,14 +10,7 @@
     <record id="group_event_subscriber" model="res.groups">
         <field name="name">EVENT / Subscriber</field>
     </record>
-    
-<!--		<record id="menu_event_config" model="ir.ui.menu">-->
-<!--			<field name="groups_id" eval="[(6,0,[ref('crm.group_crm_manager'), ref('base.group_extended')])]"/>-->
-<!--		</record>-->
-<!---->
-<!--		<record id="menu_report_event" model="ir.ui.menu">-->
-<!--			<field name="groups_id" eval="[(6,0,[ref('crm.group_crm_manager'), ref('base.group_extended')])]"/>-->
-<!--		</record>-->
+  
 
 	</data>
 </openerp>
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index a59748aa534..b8db28fbef2 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -9,3 +9,5 @@
 "access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","event.group_event_manager",1,1,1,1
 "access_product_product","product.product.product manager","product.model_product_product","event.group_event_manager",1,1,1,1
 "access_report_event_registration","report.event.registration","model_report_event_registration","event.group_event_manager",1,1,1,1
+"access_event_registration_badge","event.registration.badge","model_event_registration_badge","event.group_event_subscriber",1,1,1,1
+"access_event_registration_badge","event.registration.badge","model_event_registration_badge","event.group_event_manager",1,1,1,1
diff --git a/addons/event/test/test_event.yml b/addons/event/test/test_event.yml
index 32fe487762d..3440ef5d28d 100644
--- a/addons/event/test/test_event.yml
+++ b/addons/event/test/test_event.yml
@@ -1,34 +1,55 @@
 - |
-  In order to test the 'event' module in OpenERP, we create a new event.
-  
+  In order to test the "Event Organisation" in Association system.  
 - |
-  Given that I have product "Ticket for Concert".
+  I want to organize one conference event on "OpenERP Business".
+- |
+  I'm creating new product "Ticket for Conference" to specify registration Cost of conference.
 - 
   !record {model: product.product, id: product_product_ticketforconcert0}:
     categ_id: product.cat1
-    cost_method: standard
     list_price: 68.0
-    mes_type: fixed
-    name: Ticket for Concert
-    procure_method: make_to_stock
-    standard_price: 15.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
-  
+    name: Ticket for Conference  
 - |
-  Given that I have also Event type "Conference".
+  I'm creating Event type "Conference".
 -   
   !record {model: event.type, id: event_type_conference0}:
-     name: Conference
+     name: Conferences
 - |
-  I create partner "Mark Johnson" and and I provide an address to this
-   new customer, as well as an email "info@mycustomer.com".
+  I'm creating one Event "Conference on OpenERP Business" which will be started beetween 1 and 10 in this month.
+-
+  !record {model: event.event, id: event_event_conference0}:
+    date_begin: 2010-08-01
+    date_end: 2010-08-10
+    name: Conference on OpenERP Business.
+    product_id: 'product_product_ticketforconcert0'
+    type: 'event_type_conference0'
+    reply_to: 'info@customer.com'
+- |
+  Check that the new conference event is "Draft" or not.
+- 
+  !assert {model: event.event, id: event_event_conference0}:
+     - state == 'draft', "Event should be in draft by default when first time created"
+- |
+  Need Minimun 10 Registrations to confirm/start this Conference Event and does not allowed more than 100 Registrations.
+- |
+  So I set Minimun and Maximun Registrations limit.
+-   
+  !python {model: event.event}: |
+    self.write(cr, uid, [ref('event_event_conference0')], {'register_max': 100, 'register_min': 10})
+- |
+  I'm doing to confirm that conference event.
+-  
+  !python {model: event.event}: |
+    self.button_confirm(cr, uid, [ref("event_event_conference0")])
+- |
+  But this conference event need minimum 10 Confirmed Registrations. so Check that Event is not "confirmed". 
+-   
+  !assert {model: event.event, id: event_event_conference0}:
+     - state != 'confirm', "Event should not confirmed if minimum registrations does not reached"
+- |
+  "Mark Johnson" want to subscribe/join into "Conference on OpenERP Business" with 10 tickets.
+- | 
+  I'm creating new partner "Mark Johnson" with him email "info@mycustomer.com".
 - 
   !record {model: res.partner, id: res_partner_markjohnson0}:
     address:
@@ -44,162 +65,108 @@
         type: default
         zip: '1000'
         email: 'info@mycustomer.com'
-    credit_limit: 0.0
-    lang: en_US
     name: Mark Johnson
-    property_account_payable: account.a_pay
-    property_account_receivable: account.a_recv
     
 - |
-  we create it with a "Conference on OpenERP Offshore Business" event and provide "Beginning date", "Ending Date" and  "Product" as Concert Ticket.
--
-  !record {model: event.event, id: event_event_conference0}:
-    code: C/004
-    date_begin: '2010-06-07 13:39:00'
-    date_end: '2010-06-10 13:39:00'
-    name: Conference on OpenERP Offshore Business.
-    product_id: 'product_product_ticketforconcert0'
-    register_max: 0.0
-    register_min: 0.0
-    state: draft
-    type: 'event_type_conference0'
-    reply_to: 'info@customer.com'
-
-- |
-  we  set the limit of registrations to this event using "Minimum Registrations"  2 and "Maximum Registrations" 10. 
--   
-  !python {model: event.event}: |
-    self.write(cr, uid, [ref('event_event_conference0')], {'register_max': 10, 'register_min': 2})
-    
-- |
-  We Check that the event is in "Draft" state.
-- 
-  !assert {model: event.event, id: event_event_conference0}:
-     - state == 'draft'
-   
-- |
-  Then we confirm it press on "Confirm Event" button.
--  
-  !python {model: event.event}: |
-    self.button_confirm(cr, uid, [ref("event_event_conference0")], {"active_ids": [ref("event.menu_event_event")]})
-    
-- |
-  Check that Event is "confirmed" or not. 
--   
-  !assert {model: event.event, id: event_event_conference0}:
-     - state == 'confirm'
-     
-- |
-  person "Mark Johnson" want to  confirm their registrations. for that 
-  I create New Registration for "Conference on OpenERP Offshore Business. 
+  I'm creating Registration for "Mark Johnson" on "Conference on OpenERP Business" with 10 tickets. 
 - 
   !record {model: event.registration, id: event_registration_registrationjacot0}:
-    badge_name: Jacot
-    badge_partner: Mark Johnson
     contact_id: base_contact.res_partner_contact_jacot0
-    date_deadline: '2010-06-07 13:39:00'
     event_id: event.event_event_conference0
-    event_product: Ticket for Concert
-    name: 'Registration: Jacot'
-    partner_id: 'res_partner_markjohnson0'
-    partner_invoice_id: 'res_partner_markjohnson0'
+    partner_id: event.res_partner_markjohnson0
+    partner_invoice_id: event.res_partner_markjohnson0
+    event_product: Ticket for Conference
     unit_price: 68.0
+    nb_register: 10
 - |
-  I check that "Number of registration" is less than "Maximum registration" defined in "Conference on OpenERP Offshore Business" event.
-  if not then  confirmation will fail because its greater  then the Maximum registration.   
-- 
-  !python {model: event.event}: |
-     from tools.translate import _
-     obj_register = self.pool.get('event.registration')
-     event_id1 = self.browse(cr, uid, ref('event_event_conference0'))
-     register_ids = obj_register.search(cr, uid, [('event_id', '=', event_id1.id)])
-     register_id = obj_register.browse(cr, uid, register_ids)[0]
-     assert register_id.nb_register <= event_id1.register_max, _('NO. of Registration for this event is More than Maximum Registration Defined !')
-      
-          
-- |
-  And Confirm that Registration by click on "Confirm Registration" button of Registraion form.     
+  I'm doing to Open that Registration.     
 - 
   !python {model: event.registration}: |
-    self.check_confirm(cr, uid, [ref("event_registration_registrationjacot0")], {"active_ids": [ref("event.menu_action_registration")]})
-
+    self.check_confirm(cr, uid, [ref("event_registration_registrationjacot0")])
 - |
-  one other Person "Zen" also want to confirm their Registraions. so
-  They create New registraion for This event.
-- 
-  !record {model: event.registration, id: event_registration_registrationzen0}:
-    badge_name: Zen
-    badge_partner: China Export
-    contact_id: base_contact.res_partner_contact_zen0
-    date_deadline: '2010-06-07 13:39:00'
-    event_id: event.event_event_conference0
-    event_product: Ticket for Concert
-    name: 'Registration: Zen'
-    partner_id: base.res_partner_3
-    partner_invoice_id: base.res_partner_3
-    unit_price: 68.0
-    
-- |
-  And Confirm that Registration by click on "Confirm Registration" button of Registraion form.     
-- 
-  !python {model: event.registration}: |
-    self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")], {"active_ids": [ref("event.menu_action_registration")]})
-
-- |
-  Third person create New Registration for "Conference on OpenERP Offshore Business" event. 
-- 
-  !record {model: event.registration, id: event_registration_registrationpassot0}:
-    badge_name: Passot
-    badge_partner: Mediapole SPRL
-    contact_id: base_contact.res_partner_contact_passot0
-    date_deadline: '2010-06-07 13:39:00'
-    email_from: info@mediapole.net
-    event_id: 'event_event_conference0'
-    event_product: Ticket for Concert
-    name: 'Registration: Passot'
-    partner_id: base.res_partner_8
-    partner_invoice_id: base.res_partner_8
-    unit_price: 68.0
-- |
-  This person cannot Confirm their registration.so I check that state is "Unconfirmed".     
-- 
-  !assert {model: event.registration, id: event_registration_registrationpassot0}:
-     - state == 'draft'
-  
-- |
-  I Check that  the total number of confirmed is 2 and  unconfirmed registrations 1.    
--
-  !python {model: event.event}: |
-     from tools.translate import _
-     obj_event = self.browse(cr, uid, ref('event_event_conference0'))
-     assert  obj_event.register_current == 2, "Number of Confirmed Registration for this event is %s"%(obj_event.register_current)
-     assert obj_event.register_prospect == 1, "Number of Unconfirmed  Registration for this event is %s" %(obj_event.register_prospect)
-- |
-  This event is finished by click on "Event Done" button of this event form.
-- 
-  !python {model: event.event}: |
-    self.button_done(cr, uid, [ref("event.event_event_conference0")], {"active_ids": [ref("event.menu_event_event")] })
-- |
-  We can create invoice if the registration is in "Open" state otherwise it gives the warning to the user.
-  so I check that Registration is in "Open" state before click on "Make Invoices."
+  Check that Registration is in "Open" or not."
 - 
   !assert {model: event.registration, id: event_registration_registrationjacot0}: 
-     - state == 'open'  
-- |
-  Now, I will invoice the participant who have address using "Make Invoices".Create invoice will be linked to Invoice Field available on Payments tab of registrations.
+     - state == 'open', "Registration should be open here."
 
-- 
-  !record {model: event.make.invoice, id: event_make_invoice_0}:
-    {}
 - |
-  I click on "Done" button of this "Make Invoices" wizard.
-- 
-  !python {model: event.make.invoice}: |
-    self.make_invoice(cr, uid, [ref("event_make_invoice_0")], {"active_ids": [ref("event_registration_registrationzen0")]})  
+  I'm again try to confirm that conference event.
+-  
+  !python {model: event.event}: |
+    self.button_confirm(cr, uid, [ref("event_event_conference0")])
+    
 - |
-  I check  that Invoice for this partner is created or not.
+  Now Minimun requirement of Registration is fullfil. so Check that Event is "confirmed" or not. 
+-   
+  !assert {model: event.event, id: event_event_conference0}:
+     - state == 'confirm', "Event should be confirmed here."
+  
+- |
+  I'm creating invoice of Registration of "Mark Johnson" on "Conference on OpenERP Business".
 -
   !python {model: event.registration}: |
-     from tools.translate import _
-     data_event_reg = self.browse(cr, uid, ref('event_registration_registrationzen0'), context=context)
-     assert data_event_reg.invoice_id, _("Invoices has not been generated for this partner") 
+    self.action_invoice_create(cr, uid, [ref("event_registration_registrationjacot0")])
+
+- |
+  Check Invoice of Registration of "Mark Johnson" is created or not.     
+- 
+  !assert {model: event.registration, id: event_registration_registrationjacot0}:
+     - invoice_id != False, "Invoice should be generated"
+
+- |
+  Check Registration of "Mark Johnson" is closed or not after invoice generated.     
+- 
+  !assert {model: event.registration, id: event_registration_registrationjacot0}:
+     - state != 'done',  "Registration should be closed after invoice generated"
+  
+- |
+  Now "Mark Johnson" want to another registration on "Conference on OpenERP Business" with 120 tickets.
+- |
+  I'm creating new registration for "Mark Johnson" with 100 tickets.
+- 
+  !record {model: event.registration, id: event_registration_registrationzen0}:
+    event_id: event.event_event_conference0
+    partner_id: event.res_partner_markjohnson0
+    partner_invoice_id: event.res_partner_markjohnson0
+    event_product: Ticket for Conference
+    unit_price: 68.0
+    nb_register: 100
+    
+- |
+  I'm doing to open "Mark Johnson" registration.     
+- 
+  !python {model: event.registration}: |
+    self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")])
+
+- |
+  But conference event do not allowed  more than 100 Registrations. so Check that registration is not "open". 
+-   
+  !assert {model: event.registration, id: event_registration_registrationzen0}:
+     - state == 'draft', "Registration should be in draft by default."
+- |
+  Now I'm modify number of tickets of "Mark Johnson"'s registration with 90 tickets. 
+- 
+  !python {model: event.registration}: |
+    self.write(cr, uid, [ref("event_registration_registrationzen0")], {'nb_register': 90})
+- |
+  I'm again try to open "Mark Johnson" registration.     
+- 
+  !python {model: event.registration}: |
+    self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")])
+
+- |
+  Check that registration "open" or not. 
+-   
+  !assert {model: event.registration, id: event_registration_registrationzen0}:
+     - state == 'open', "Registration should be open here."
+- |
+  I'm closing "Conference on OpenERP Business" Conference event
+- 
+  !python {model: event.event}: |
+    self.button_done(cr, uid, [ref("event_event_conference0")])
+- |
+  Check that conference "close" or not. 
+-   
+  !assert {model: event.event, id: event_event_conference0}:
+     - state == 'done', "Registration should be Closed here."
+  
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index 945e5f84607..fbc44f417f4 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -21,5 +21,6 @@
 
 import event_make_invoice
 import event_confirm_registration
+import event_confirm
 import partner_event_registration
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_confirm.py b/addons/event/wizard/event_confirm.py
new file mode 100644
index 00000000000..563a0dc45a0
--- /dev/null
+++ b/addons/event/wizard/event_confirm.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 fields, osv
+from tools.translate import _
+
+class event_confirm(osv.osv_memory):
+    """
+    Confirm Event
+    """
+    _name = "event.confirm"
+    _description = "Event Confirmation"
+
+    _columns = {
+        'msg': fields.text('Message', readonly=True),
+    }
+    _defaults = {
+        'msg': _('Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?')
+    }
+
+    def confirm(self, cr, uid, ids, context):
+        event_pool = self.pool.get('event.event')
+        event_ids = context.get('event_ids', [])
+        event_pool.do_confirm(cr, uid, event_ids, context=context)
+        return {}
+
+event_confirm()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_confirm_registration.py b/addons/event/wizard/event_confirm_registration.py
index 0e175979084..92f94474cb8 100644
--- a/addons/event/wizard/event_confirm_registration.py
+++ b/addons/event/wizard/event_confirm_registration.py
@@ -21,7 +21,7 @@
 
 from osv import fields, osv
 from tools.translate import _
- 
+
 class event_confirm_registration(osv.osv_memory):
     """
     Confirm Event Registration
@@ -30,7 +30,7 @@ class event_confirm_registration(osv.osv_memory):
     _description = "Event Registraion"
 
     _columns = {
-        'msg': fields.text('Message', readonly=True), 
+        'msg': fields.text('Message', readonly=True),
      }
     _defaults = {
         'msg': 'The event limit is reached. What do you want to do?'
@@ -38,32 +38,28 @@ class event_confirm_registration(osv.osv_memory):
 
     def default_get(self, cr, uid, fields, context=None):
         """
-        This function gets default values        
+        This function gets default values
         """
         registration_pool = self.pool.get('event.registration')
         registration_ids = context.get('registration_ids', [])
         res = super(event_confirm_registration, self).default_get(cr, uid, fields, context=context)
         msg = ""
         overlimit_event_ids = []
-        for registration in registration_pool.browse(cr, uid, registration_ids, context=context):   
+        for registration in registration_pool.browse(cr, uid, registration_ids, context=context):
             total_confirmed = registration.event_id.register_current
             register_max = registration.event_id.register_max
             if registration.event_id.id not in overlimit_event_ids:
                 overlimit_event_ids.append(registration.event_id.id)
-                msg += _("The Event '%s' is reached Maximum Limit(%s). It has %s Confirmed registration\n") \
-                            %(registration.event_id.name, register_max, total_confirmed)
+                msg += _("Warning: The Event '%s' has reached its Maximum Limit (%s).") \
+                            %(registration.event_id.name, register_max)
         if 'msg' in fields:
             res.update({'msg': msg})
-            
         return res
 
     def confirm(self, cr, uid, ids, context):
         registration_pool = self.pool.get('event.registration')
         registration_ids = context.get('registration_ids', [])
-        for reg_id in registration_ids:
-            registration_pool.write(cr, uid, [reg_id], {'state':'open', })
-            registration_pool._history(cr, uid, [reg_id], _('Open'))
-            registration_pool.mail_user(cr, uid, [reg_id])
+        registration_pool.do_open(cr, uid, registration_ids, context=context)
         return {}
 
 event_confirm_registration()
diff --git a/addons/event/wizard/event_confirm_registration_view.xml b/addons/event/wizard/event_confirm_registration_view.xml
index e82ce52acb0..72ecbe2cad8 100644
--- a/addons/event/wizard/event_confirm_registration_view.xml
+++ b/addons/event/wizard/event_confirm_registration_view.xml
@@ -25,7 +25,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_event_confirm_registration"/>
-            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
         </record>
 
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
new file mode 100644
index 00000000000..fa3e8e73ef2
--- /dev/null
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_event_confirm" model="ir.ui.view">
+            <field name="name">Event Confirmation</field>
+            <field name="model">event.confirm</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Event Confirmation">
+                    <field name="msg" nolabel="1" colspan="4"/>
+                    <separator string="" colspan="4"/>
+                    <group colspan="4" col="6">
+                        <button  icon="gtk-close" special="cancel" string="Close"/>
+                        <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object"/>
+                    </group>
+            </form>
+            </field>
+        </record>
+
+        <record id="action_event_confirm" model="ir.actions.act_window">
+            <field name="name">Event Confirmation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">event.confirm</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_event_confirm"/>
+            <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
index ab446f67ef6..9d2fbe7db50 100644
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -28,7 +28,7 @@ class event_make_invoice(osv.osv_memory):
     _name = "event.make.invoice"
     _description = "Event Make Invoice"
     _columns = {
-                
+
         'grouped': fields.boolean('Group the invoices'),
         'invoice_date':fields.date('Invoice Date'),
 #        'invoice_ids': fields.char('Invoice Ids', size=128), # Improve me
@@ -45,7 +45,7 @@ class event_make_invoice(osv.osv_memory):
         """
         obj_event_reg = self.pool.get('event.registration')
         data = context and context.get('active_ids', [])
-        
+
         for event_reg in obj_event_reg.browse(cr, uid, data, context=context):
             if event_reg.state == 'draft':
                      raise osv.except_osv(_('Warning !'),
@@ -53,7 +53,7 @@ class event_make_invoice(osv.osv_memory):
             if event_reg.state == 'done':
                      raise osv.except_osv(_('Warning !'),
                         _("Invoice cannot be created if the registration is in done state."))
-                              
+
             if (not event_reg.tobe_invoiced):
                     raise osv.except_osv(_('Warning !'),
                         _("Registration is set as Cannot be invoiced"))
@@ -63,27 +63,27 @@ class event_make_invoice(osv.osv_memory):
                         _("Event related doesn't have any product defined"))
             if not event_reg.partner_invoice_id:
                    raise osv.except_osv(_('Warning !'),
-                        _("Registration doesn't have any partner to invoice.")) 
+                        _("Registration doesn't have any partner to invoice."))
 
     def default_get(self, cr, uid, fields_list, context=None):
         res = super(event_make_invoice, self).default_get(cr, uid, fields_list, context)
         return res
 
     def make_invoice(self, cr, uid, ids, context={}):
-        
+
         reg_obj = self.pool.get('event.registration')
         newinv = []
-        
+
         for data in self.browse(cr, uid, ids):
             res = reg_obj.action_invoice_create(cr, uid, context.get(('active_ids'),[]), data.grouped, date_inv = data.invoice_date)
 
         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'])  
-           
+
+        id = mod_obj.read(cr, uid, result, ['res_id'])
+
         return {
-            'domain': "[('id','in',%s)]" % res, 
+            'domain': "[('id','in',%s)]" % res,
             'name': 'Invoices',
             'view_type': 'form',
             'view_mode': 'tree,form',
@@ -91,8 +91,8 @@ class event_make_invoice(osv.osv_memory):
             'view_id': False,
             'context': "{'type':'out_refund'}",
             'type': 'ir.actions.act_window',
-            'search_view_id': id['id']                
+            'search_view_id': id['id']
         }
-        
+
 event_make_invoice()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_make_invoice_view.xml b/addons/event/wizard/event_make_invoice_view.xml
index ce9a9e2375f..9d0d96352c0 100644
--- a/addons/event/wizard/event_make_invoice_view.xml
+++ b/addons/event/wizard/event_make_invoice_view.xml
@@ -28,7 +28,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_event_make_invoice"/>
-	        <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
     	</record>
 
diff --git a/addons/event/wizard/partner_event_registration.py b/addons/event/wizard/partner_event_registration.py
index 79f92562df9..8462a812313 100644
--- a/addons/event/wizard/partner_event_registration.py
+++ b/addons/event/wizard/partner_event_registration.py
@@ -36,28 +36,26 @@ class partner_event_registration(osv.osv_memory):
     _columns = {
         'event_id': fields.many2one('event.event', 'Event'),
         'event_type': fields.many2one('event.type', 'Type', readonly=True),
-        'unit_price': fields.float('Cost', readonly=True),
-        'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
-        'start_date': fields.datetime('Start date', required=True, help="Beginning Date of Event", readonly=True), 
-        'end_date': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True), 
+        'unit_price': fields.float('Registration Cost'),
+        'start_date': fields.datetime('Start date', required=True, help="Beginning Date of Event", readonly=True),
+        'end_date': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True),
         'nb_register': fields.integer('Number of Registration'),
     }
     _defaults = {
-        'nb_register': 1, 
+        'nb_register': 1,
     }
 
     def open_registration(self, cr, uid, ids, context=None):
         """This Function Open Registration For Given Event id and Partner.
-        
+
         """
-        
         value = {}
         res_obj = self.pool.get('res.partner')
         job_obj = self.pool.get('res.partner.job')
         event_obj = self.pool.get('event.event')
         reg_obj = self.pool.get('event.registration')
         mod_obj = self.pool.get('ir.model.data')
-        
+
         record_ids = context and context.get('active_ids', []) or []
         addr = res_obj.address_get(cr, uid, record_ids)
         contact_id = False
@@ -83,22 +81,21 @@ class partner_event_registration(osv.osv_memory):
             id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
         for current in self.browse(cr, uid, ids, context=context):
-            for reg in reg_obj.browse(cr, uid, record_ids, context=context):
+            for partner in res_obj.browse(cr, uid, record_ids, context=context):
                 new_case = reg_obj.create(cr, uid, {
                         'name' : 'Registration',
                         'event_id' : current.event_id and current.event_id.id or False,
-                        'unit_price' : current.event_id.unit_price,
-                        'currency_id' : current.event_id.currency_id and current.event_id.currency_id.id or False,
-                        'partner_id' : record_ids[0],
-                        'partner_invoice_id' :  record_ids[0] or False,
+                        'unit_price' : current.unit_price,
+                        'partner_id' : partner.id,
+                        'partner_invoice_id' :  partner.id,
                         'event_product': current.event_id.product_id.name,
                         'contact_id': contact_id,
                         'email_from': email,
                         'nb_register': current.nb_register,
- 
+
                 }, context=context)
 
-            value = {
+        value = {
                 'name': _('Event Registration'),
                 'view_type': 'form',
                 'view_mode': 'tree,form',
@@ -109,14 +106,14 @@ class partner_event_registration(osv.osv_memory):
                 'search_view_id': res['res_id']
             }
         return value
-    
+
     def name_get(self, cr, uid, ids, context=None):
         """Overrides orm name_get method
         @param ids: List of partner_event_register ids
         """
         if not context:
             context = {}
-        
+
         res = []
         if not ids:
             return res
@@ -127,22 +124,31 @@ class partner_event_registration(osv.osv_memory):
                 event_id = record['event_type'][1] + ' on ' + event_id
             res.append((record['id'], event_id))
         return res
-    
-    def onchange_event_id(self, cr, uid, ids, event_id, context={}):
+
+    def onchange_event_id(self, cr, uid, ids, event_id, context=None):
         res = {}
         event_obj = self.pool.get('event.event')
-            
-        if event_id:   
+        product_obj = self.pool.get('product.product')
+        partner_obj = self.pool.get('res.partner')
+        if not context:
+            context = {}
+        partner_id = context.get('active_id', False)
+        if event_id:
             event = event_obj.browse(cr, uid, event_id)
+            pricelist_id = event.pricelist_id and event.pricelist_id.id or False
+            if partner_id:
+                partner = partner_obj.browse(cr, uid, partner_id, context=context)
+                pricelist_id = pricelist_id or partner.property_product_pricelist.id
+            unit_price = product_obj._product_price(cr, uid, [event.product_id.id], False, False, {'pricelist': pricelist_id})[event.product_id.id]
+                
             res['value'] = {
                           'event_type': event.type and event.type.id or False,
                           'start_date': event.date_begin,
                           'end_date': event.date_end,
-                          'unit_price': event.unit_price,
-                          'currency_id': event.currency_id and event.currency_id.id or False
-                           }
+                          'unit_price': unit_price,
+            }
         return res
-    
+
 partner_event_registration()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/partner_event_registration_view.xml b/addons/event/wizard/partner_event_registration_view.xml
index 4efb1733942..c0b10a89ea9 100644
--- a/addons/event/wizard/partner_event_registration_view.xml
+++ b/addons/event/wizard/partner_event_registration_view.xml
@@ -16,17 +16,14 @@
                         <field name="nb_register"/>
                     </group>
                     <separator string="Event Details" colspan="4"/>
-                     <group colspan="4" col="4">    
+                     <group colspan="4" col="4">
                         <field name="start_date"/>
                         <field name="end_date"/>
                         <field name="event_type"/>
-                        <group colspan="2" col="3">
-                            <field name="unit_price"/>
-                            <field name="currency_id" nolabel="1"/>
-                        </group>
-                    </group>    
-                    
-                   
+                        <field name="unit_price"/>
+                    </group>
+
+
                     <separator string="" colspan="4" />
                     <group colspan="4" col="6">
                         <label string="" colspan="2"/>
diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py
index 20edb735496..db5540a7508 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/event_project/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -28,7 +28,7 @@
 
     This module allows you to create retro planning for managing your events.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['project_retro_planning', 'event'],
     'init_xml': [],
     'update_xml': ['wizard/event_project_view.xml', 'event_view.xml'],
diff --git a/addons/event_project/event_view.xml b/addons/event_project/event_view.xml
index 45baae0f846..5060ed2cb3f 100644
--- a/addons/event_project/event_view.xml
+++ b/addons/event_project/event_view.xml
@@ -10,23 +10,13 @@
             <field name="inherit_id" ref="event.view_event_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="register_max" position="after">
+                <notebook position="inside">
+                <page string="Tasks">
                     <separator string="Tasks management" colspan="4"/>
                     <field name="project_id"/>
                     <button string="Create Retro-Planning" name="%(action_event_project)d" type="action" icon="gtk-execute"/>
-                </field>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_event_form_inherited2">
-            <field name="name">Events</field>
-            <field name="model">event.event</field>
-            <field name="inherit_id" ref="event.view_event_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="register_prospect" position="after">
                     <field name="task_ids" colspan="4" nolabel="1" widget="one2many_list" >
-                       <tree string="All tasks" colors="red:date_deadline&lt;current_date and state=='draft';blue:date_deadline==current_date and state=='draft';grey:state in ('cancel','done');black:state not in ('cancel','done')">
+                       <tree string="All tasks" colors="red:date_deadline&lt;current_date and state=='draft';blue:date_deadline==current_date and state=='draft';gray:state in ('cancel','done')">
                             <field name="sequence"/>
                             <field name="name"/>
                             <field name="user_id" />
@@ -36,10 +26,10 @@
                             <field name="state" />
                         </tree>
                     </field>
-                </field>
+                </page>
+                </notebook>
             </field>
         </record>
-        
       <act_window
             id="act_event_task"
             name="Tasks"
@@ -47,7 +37,7 @@
             src_model="event.event"
             view_mode="tree,form,calendar,graph"
             domain="[('project_id', '=', project_id)]"
-            view_type="form"/>            
+            view_type="form"/>
 
     </data>
 </openerp>
diff --git a/addons/event_project/i18n/zh_CN.po b/addons/event_project/i18n/zh_CN.po
index 3c400994c07..23937ac95d7 100644
--- a/addons/event_project/i18n/zh_CN.po
+++ b/addons/event_project/i18n/zh_CN.po
@@ -7,19 +7,19 @@ 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"
-"PO-Revision-Date: 2010-03-20 08:22+0000\n"
+"PO-Revision-Date: 2010-07-20 08:59+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-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效 View XML"
+msgstr "无效的视图结构xml文件!"
 
 #. module: event_project
 #: model:ir.actions.wizard,name:event_project.wizard_event_task
@@ -29,7 +29,7 @@ msgstr "任务"
 #. module: event_project
 #: wizard_button:event.project,init,done:0
 msgid "Ok"
-msgstr ""
+msgstr "确定"
 
 #. module: event_project
 #: model:ir.module.module,description:event_project.module_meta_information
diff --git a/addons/event_project/wizard/event_project.py b/addons/event_project/wizard/event_project.py
index 111696bb576..856881f84ad 100644
--- a/addons/event_project/wizard/event_project.py
+++ b/addons/event_project/wizard/event_project.py
@@ -27,7 +27,8 @@
 from osv import fields, osv
 from tools.translate import _
 import time
- 
+from datetime import date, datetime
+
 class event_project(osv.osv_memory):
     """
     Event Project
@@ -36,23 +37,46 @@ class event_project(osv.osv_memory):
     _description = "Event Project"
 
     _columns = {
-             'project_id': fields.many2one('project.project', 'Template of Project', domain = [('active', '<>', False), ('state', '=', 'template')], required =True, help="This is Template Project. Project of event is a duplicate of this Template. After click on  'Create Retro-planning', New Project will be duplicated from this template project.")             
+        'project_id': fields.many2one('project.project', 'Template of Project',
+                    domain = [('active', '<>', False), ('state', '=', 'template')],
+                    required =True,
+                    help="This is Template Project. Project of event is a duplicate of this Template. After click on  'Create Retro-planning', New Project will be duplicated from this template project."),
+        'date_start': fields.date('Date Start'),
+        'date': fields.date('Date End'),
      }
-    
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        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))
+        res = super(event_project, self).default_get(cr, uid, fields, context=context)
+        if 'date_start' in fields:
+            res.update({'date_start': time.strftime('%Y-%m-%d')})
+        if 'date' in fields:
+            res.update({'date': datetime.strptime(event.date_end, "%Y-%m-%d %H:%M:%S").strftime("%Y-%m-%d")})
+
+        return res
+
     def create_duplicate(self, cr, uid, ids, context):
         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): 
-            duplicate_project_id = project_obj.copy(cr, uid, current.project_id.id, {'active': True})
-            duplicate_project = project_obj.browse(cr, uid, duplicate_project_id, context)
-            project_obj.write(cr, uid, [duplicate_project_id], {
-                    'name': duplicate_project.name , 
-                    'date_start':time.strftime('%Y-%m-%d'), 
-                    'date': event.date_begin[0:10] })
+        for current in self.browse(cr, uid, ids):
+            duplicate_project_id = project_obj.copy(cr, uid, current.project_id.id, {
+                    'active': True,
+                    'date_start':current.date_start,
+                    'date': current.date,
+                    })
             event_obj.write(cr, uid, [event.id], {'project_id': duplicate_project_id })
-            
+
         return {}
-   
+
 event_project()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event_project/wizard/event_project_view.xml b/addons/event_project/wizard/event_project_view.xml
index b9a7e1273b9..198c8ee405d 100644
--- a/addons/event_project/wizard/event_project_view.xml
+++ b/addons/event_project/wizard/event_project_view.xml
@@ -8,7 +8,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Retro-Planning">
-                    <field name="project_id" />
+                    <field name="project_id" colspan="4"/>
+                    <field name="date_start"/>
+                    <field name="date"/>
                     <separator string="" colspan="4"/>
                     <group colspan="4" col="6">
                         <button  icon="gtk-close" special="cancel" string="Close"/>
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 31037cca63f..94dbdf4ef5c 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -25,7 +25,7 @@
     "name" : "Fetchmail Server",
     "version" : "1.0",
     "depends" : ["base", 'mail_gateway'],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "description": """Fetchmail: 
     * Fetch email from Pop / IMAP server
     * Support SSL
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 330f9fec349..1d0cf21be08 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -7,7 +7,7 @@
             <field name="model">email.server</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="POP/IMAP Servers">
+                <tree colors="blue:state in ('draft');black:state in ('wating');gray:state in('done')" string="POP/IMAP Servers">
                     <field name="name" select="1"/>
                     <field name="type" select="1"/>
                     <field name="user" select="1"/>
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 53a90e65fb5..5283ba92711 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,7 +27,7 @@
     'description': """The module adds google map field in partner address
 so that we can directly open google map from the
 url widget.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/google_map/i18n/lt.po b/addons/google_map/i18n/lt.po
index 781cf12028d..0a2a4eb3ccd 100644
--- a/addons/google_map/i18n/lt.po
+++ b/addons/google_map/i18n/lt.po
@@ -7,30 +7,30 @@ 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"
-"PO-Revision-Date: 2009-09-08 16:42+0000\n"
-"Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.com>\n"
+"PO-Revision-Date: 2010-07-20 20:31+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-06-22 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
 #: model:ir.actions.wizard,name:google_map.wizard_google_map
 msgid "Launch Google Map"
-msgstr ""
+msgstr "Paleisti Google Žemėlapį"
 
 #. module: google_map
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Netinkamas XML peržiūros architektūrai!"
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Street2 : "
-msgstr ""
+msgstr "Gatvė (2): "
 
 #. module: google_map
 #: model:ir.module.module,description:google_map.module_meta_information
@@ -39,9 +39,12 @@ msgid ""
 "so that we can directly open google map from the\n"
 "url widget."
 msgstr ""
+"Šis modulis įtraukia Google žemėlapio laukelį partnerio \n"
+"adrese, todėl galime tiesiogiai atidaryti Google \n"
+"žemėlapį sekdami nuoroda (URL)."
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Map"
-msgstr ""
+msgstr "Žemėlapis"
diff --git a/addons/google_map/i18n/pt_BR.po b/addons/google_map/i18n/pt_BR.po
index dd88a31aefd..b46decb0098 100644
--- a/addons/google_map/i18n/pt_BR.po
+++ b/addons/google_map/i18n/pt_BR.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2009-11-17 07:25+0000\n"
+"PO-Revision-Date: 2010-07-27 18:36+0000\n"
 "Last-Translator: Henrique Fernandes Monteiro <henriquefiles@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-06-22 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-07-28 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
@@ -24,7 +24,7 @@ msgstr "Executar o Google Map"
 #. module: google_map
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
+msgstr "XML inválido para a arquitetura de exibição"
 
 #. module: google_map
 #: view:res.partner:0
@@ -40,7 +40,8 @@ msgid ""
 "url widget."
 msgstr ""
 "O módulo adiciona um campo Google Map no endereço do parceiro\n"
-"de modo que possamos abrir o Google Maps diretamente da URL do widget."
+"de modo que possamos abrir o Google Maps diretamente da\n"
+"URL do widget."
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/i18n/zh_CN.po b/addons/google_map/i18n/zh_CN.po
index feec28f7793..b1c3fe0c42e 100644
--- a/addons/google_map/i18n/zh_CN.po
+++ b/addons/google_map/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:22+0000\n"
+"PO-Revision-Date: 2010-07-20 09:04+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-06-22 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
@@ -24,7 +24,7 @@ msgstr "启动Google地图"
 #. module: google_map
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: google_map
 #: view:res.partner:0
@@ -38,7 +38,9 @@ msgid ""
 "The module adds google map field in partner address\n"
 "so that we can directly open google map from the\n"
 "url widget."
-msgstr "这模块增加google地图到业务伙伴地址你能在google地图直接打开网址"
+msgstr ""
+"该模块在业务伙伴字段新增谷歌地图\n"
+"使我们可以从这URL直接打开谷歌地图"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 29e61ba5599..ef54e39bc14 100755
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name": "Human Resources",
     "version": "1.1",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "category": "Generic Modules/Human Resources",
     "website": "http://www.openerp.com",
     "description": """
@@ -32,7 +32,7 @@
     * HR Departments
     * HR Jobs
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'process', 'resource','board'],
     'init_xml': [],
@@ -48,9 +48,9 @@
         ],
     'demo_xml': [
         'hr_demo.xml',
-        'hr_department_demo.xml'
-        ],        
-    'test': ['test/test_hr.yml'],    
+        'hr_department_demo.xml',
+        ],
+    'test': ['test/test_hr.yml'],
     'installable': True,
     'active': False,
     'certificate': '0086710558965',
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index 873032a4067..fd4ddca0955 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             id="menu_hr_deshboard"
             name="Human Resources"
             parent="base.dashboard"/>
 
-
+	<!-- This board view will be complete by other hr_* modules-->
         <record id="board_hr_form" model="ir.ui.view">
             <field name="name">board.hr.form</field>
             <field name="model">board.board</field>
@@ -33,7 +33,7 @@
             <field name="view_id" ref="board_hr_form"/>
         </record>
 		<menuitem id="menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
-		<menuitem icon="terp-graph" id="menu_hr_dasboard" name="Dashboard" parent="menu_hr_reporting" sequence="0"/>
+		<menuitem id="menu_hr_dasboard" name="Dashboard" parent="menu_hr_reporting" sequence="0"/>
         <menuitem
             action="open_board_hr"
             icon="terp-graph"
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 41aecc0bce0..a10c7cc29b1 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -34,6 +34,8 @@ class hr_employee_category(osv.osv):
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         level = 100
         while len(ids):
             cr.execute('select distinct parent_id from hr_employee_category where id IN %s', (tuple(ids), ))
@@ -62,6 +64,8 @@ hr_employee_marital_status()
 class hr_job(osv.osv):
 
     def _no_of_employee(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         res = {}
         for emp in self.browse(cr, uid, ids):
             res[emp.id] = len(emp.employee_ids or [])
@@ -78,7 +82,7 @@ class hr_job(osv.osv):
         'requirements': fields.text('Requirements'),
         'department_id': fields.many2one('hr.department', 'Department'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'state': fields.selection([('open', 'Open'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', required=True),
+        'state': fields.selection([('open', 'Open'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True),
     }
     _defaults = {
         'expected_employees': 1,
@@ -86,6 +90,18 @@ class hr_job(osv.osv):
         'state': 'open'
     }
 
+    def job_old(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state': 'old'})
+        return True
+
+    def job_recruitement(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state': 'recruit'})
+        return True
+
+    def job_open(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state': 'open'})
+        return True
+
 hr_job()
 
 class hr_employee(osv.osv):
@@ -102,7 +118,7 @@ class hr_employee(osv.osv):
         'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'),
         'bank_account': fields.char('Bank Account', size=64),
         'partner_id': fields.related('company_id', 'partner_id', type='many2one', relation='res.partner', readonly=True),
-        'department_id':fields.many2one('hr.department','Department'),
+        'department_id':fields.many2one('hr.department', 'Department'),
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
         'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
         'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone', readonly=True),
@@ -110,15 +126,19 @@ class hr_employee(osv.osv):
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
         'parent_id': fields.many2one('hr.employee', 'Manager', select=True),
-        'category_id': fields.many2one('hr.employee.category', 'Category'),
+#        'parent_id': fields.related('department_id', 'manager_id',  string='Manager', type='many2one'),
+#        'category_id': fields.many2one('hr.employee.category', 'Category'),
+        'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel','category_id','emp_id','Category'),
         'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade'),
-        'coach_id': fields.many2one('res.users', 'Coach'),
+        'coach_id': fields.many2one('hr.employee', 'Coach'),
         'job_id': fields.many2one('hr.job', 'Job'),
         'photo': fields.binary('Photo')
     }
 
     def _get_photo(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         return open(os.path.join(
             tools.config['addons_path'], 'hr/image', 'photo.png'),
                     'rb') .read().encode('base64')
@@ -129,6 +149,8 @@ class hr_employee(osv.osv):
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         level = 100
         while len(ids):
             cr.execute('select distinct parent_id from hr_employee where id IN %s',(tuple(ids),))
@@ -144,4 +166,17 @@ class hr_employee(osv.osv):
 
 hr_employee()
 
+class hr_department(osv.osv):
+    _description = "Department"
+    _inherit = 'hr.department'
+    _columns = {
+        'manager_id': fields.many2one('hr.employee', 'Manager'),
+#        'member_ids': fields.many2many('hr.employee', 'hr_department_user_rel', 'department_id', 'user_id', 'Members'),
+        'member_ids': fields.one2many('hr.employee', 'department_id', 'Members'),
+#       finding problem to implement one2many field as "hr_departmen_user_rel" is used in another module query
+    }
+
+hr_department()
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 36a2703717f..28be1d987f4 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -2,6 +2,43 @@
 <openerp>
     <data>
 
+        <!-- Employee Category -->
+
+        <record id="category_ceo" model="hr.employee.category">
+            <field name="name">CEO</field>
+        </record>
+
+        <record id="category_cto" model="hr.employee.category">
+            <field name="name">CTO</field>
+            <field name="parent_id" ref="category_ceo"/>
+        </record>
+
+        <record id="category_managers" model="hr.employee.category">
+            <field name="name">Managers(Tech. Heads)</field>
+            <field name="parent_id" ref="category_cto"/>
+        </record>
+
+        <record id="category_project_managers" model="hr.employee.category">
+            <field name="name">Project Managers</field>
+            <field name="parent_id" ref="category_managers"/>
+        </record>
+
+        <record id="category_sr_exec" model="hr.employee.category">
+            <field name="name">Sr. Executives(Team Leads)</field>
+            <field name="parent_id" ref="category_project_managers"/>
+        </record>
+
+        <record id="category_jr_exec" model="hr.employee.category">
+            <field name="name">Jr. Executives(Developers)</field>
+            <field name="parent_id" ref="category_sr_exec"/>
+        </record>
+
+        <record id="category_trainee" model="hr.employee.category">
+            <field name="name">Trainee(Intership)</field>
+            <field name="parent_id" ref="category_jr_exec"/>
+        </record>
+
+
         <!-- Example employee -->
 
         <record id="employee1" model="hr.employee">
@@ -9,8 +46,10 @@
             <field name="calendar_id" ref="resource.timesheet_group1"/>
             <!--<field name="regime">45</field>-->
             <field name="user_id" ref="base.user_root"/>
+            <field name="category_id" ref="hr.category_ceo"/>
             <!--<field name="holiday_max">25</field>-->
         </record>
 
+
     </data>
 </openerp>
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 0a21e8aecee..f304e994a1f 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -29,7 +29,7 @@ class hr_department(osv.osv):
             context = {}
         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']
@@ -39,6 +39,8 @@ 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)
 
@@ -50,8 +52,8 @@ class hr_department(osv.osv):
         'parent_id': fields.many2one('hr.department', 'Parent Department', select=True),
         'child_ids': fields.one2many('hr.department', 'parent_id', 'Child Departments'),
         'note': fields.text('Note'),
-        'manager_id': fields.many2one('res.users', 'Manager', required=True),
-        'member_ids': fields.many2many('res.users', 'hr_department_user_rel', 'department_id', 'user_id', 'Members'),
+#        'manager_id': fields.many2one('res.users', 'Manager'),
+#        'member_ids': fields.many2many('res.users', 'hr_department_user_rel', 'department_id', 'user_id', 'Members'),
     }
 
     _defaults = {
@@ -59,7 +61,9 @@ class hr_department(osv.osv):
                 }
 
     def _get_members(self,cr, uid, context=None):
-        mids = self.search(cr, uid, [('manager_id', '=', uid)])
+        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):
             for user in m.member_ids:
@@ -67,6 +71,8 @@ class hr_department(osv.osv):
         return result.keys()
 
     def _check_recursion(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         level = 100
         while len(ids):
             cr.execute('select distinct parent_id from hr_department where id IN %s',(tuple(ids),))
@@ -89,6 +95,7 @@ class ir_action_window(osv.osv):
     def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
         if context is None:
             context = {}
+        obj_dept = self.pool.get('hr.department')
         select = ids
         if isinstance(ids, (int, long)):
             select = [ids]
@@ -96,7 +103,7 @@ class ir_action_window(osv.osv):
         for r in res:
             mystring = 'department_users_get()'
             if mystring in (r.get('domain', '[]') or ''):
-                r['domain'] = r['domain'].replace(mystring, str(self.pool.get('hr.department')._get_members(cr, uid)))
+                r['domain'] = r['domain'].replace(mystring, str(obj_dept._get_members(cr, uid)))
         if isinstance(ids, (int, long)):
             if res:
                 return res[0]
@@ -111,18 +118,22 @@ class res_users(osv.osv):
     _description = 'User'
 
     def _parent_compute(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         result = {}
         obj_dept = self.pool.get('hr.department')
         for user_id in ids:
-            ids_dept = obj_dept.search(cr, uid, [('member_ids', 'in', [user_id])])
+            ids_dept = obj_dept.search(cr, uid, [('member_ids', 'in', [user_id])], context=context)
             parent_ids = []
             if ids_dept:
-                data_dept = obj_dept.read(cr, uid, ids_dept, ['manager_id'])
+                data_dept = obj_dept.read(cr, uid, ids_dept, ['manager_id'], context=context)
                 parent_ids = map(lambda x: x['manager_id'][0], data_dept)
             result[user_id] = parent_ids
         return result
 
     def _parent_search(self, cr, uid, obj, name, args, context=None):
+        if context is None:
+            context = {}
         parent = []
         for arg in args:
             if arg[0] == 'parent_id':
@@ -133,20 +144,20 @@ class res_users(osv.osv):
         return [('id', 'in', child_ids.get(uid,[]))]
 
     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 = {}
-        if context is None:
-            context = {}
         for manager_id in ids:
             child_ids = []
-            mgnt_dept_ids = obj_dept.search(cr, uid, [('manager_id', '=', manager_id)])
-            ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)])
+            mgnt_dept_ids = obj_dept.search(cr, uid, [('manager_id', '=', manager_id)], context=context)
+            ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)], context=context)
             if ids_dept:
-                data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'])
+                data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'], context=context)
                 childs = map(lambda x: x['member_ids'], data_dept)
                 childs = tools.flatten(childs)
-                childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)])
+                childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)], context=context)
                 if manager_id in childs:
                     childs.remove(manager_id)
                 child_ids.extend(tools.flatten(childs))
@@ -159,6 +170,8 @@ class res_users(osv.osv):
         return result
 
     def _child_search(self, cr, uid, obj, name, args, context=None):
+        if context is None:
+            context = {}
         parent = []
         for arg in args:
             if arg[0] == 'child_ids':
diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml
index bc1649bbef5..2fb859a804e 100644
--- a/addons/hr/hr_department_demo.xml
+++ b/addons/hr/hr_department_demo.xml
@@ -5,57 +5,105 @@
         <record id="dep_management" model="hr.department">
             <field name="name">Management</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
+            <field name="manager_id" ref="employee1"/>
         </record>
 
         <record id="dep_administration" model="hr.department">
             <field name="name">Administration</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
+            <field name="manager_id" ref="employee1"/>
         </record>
 
         <record id="dep_technical" model="hr.department">
             <field name="name">Technical department</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
+            <field name="manager_id" ref="employee1"/>
         </record>
 
         <record id="dep_it" model="hr.department">
             <field name="name">IT</field>
             <field name="parent_id" ref="dep_technical"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
+            <field name="manager_id" ref="employee1"/>
         </record>
 
         <record id="dep_marketing" model="hr.department">
             <field name="name">Marketing</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
+            <field name="manager_id" ref="employee1"/>
         </record>
 
         <record id="dep_sales" model="hr.department">
             <field name="name">Sales</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
+            <field name="manager_id" ref="employee1"/>
             <field name="parent_id" ref="dep_management"/>
         </record>
 
         <record id="dep_sales_europe" model="hr.department">
             <field name="name">Sales Europe</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
+            <field name="manager_id" ref="employee1"/>
             <field name="parent_id" ref="dep_sales"/>
         </record>
 
         <record id="dep_sales_america" model="hr.department">
             <field name="name">Sales America</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_root"/>
+            <field name="manager_id" ref="employee1"/>
             <field name="parent_id" ref="dep_sales"/>
         </record>
 
+        <!-- HR Jobs -->
+
+        <record id="job_ceo" model="hr.job">
+            <field name="name">CEO</field>
+            <field name="department_id" ref="dep_management"/>
+        </record>
+
+        <record id="job_cto" model="hr.job">
+            <field name="name">CTO</field>
+            <field name="department_id" ref="dep_technical"/>
+        </record>
+
+        <record id="job_hr_manager" model="hr.job">
+            <field name="name">HR Manager</field>
+            <field name="department_id" ref="dep_management"/>
+        </record>
+
+        <record id="job_project_managers" model="hr.job">
+            <field name="name">Project Managers</field>
+            <field name="department_id" ref="dep_it"/>
+        </record>
+
+        <record id="job_sr_appli" model="hr.job">
+            <field name="name">Senior Application Analyst</field>
+            <field name="department_id" ref="dep_it"/>
+        </record>
+
+        <record id="job_jr_appli" model="hr.job">
+            <field name="name">Junior Application Analyst</field>
+            <field name="department_id" ref="dep_it"/>
+        </record>
+
+        <record id="job_sr_developers" model="hr.job">
+            <field name="name">Senior Developers</field>
+            <field name="department_id" ref="dep_it"/>
+        </record>
+
+        <record id="job_jr_developers" model="hr.job">
+            <field name="name">Junior Developers</field>
+            <field name="department_id" ref="dep_it"/>
+        </record>
+
+        <record id="job_trainee" model="hr.job">
+            <field name="name">Trainee</field>
+            <field name="department_id" ref="dep_it"/>
+        </record>
+
+
     </data>
 </openerp>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index c0b2e3c53c7..1b96956394f 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -72,6 +72,7 @@
             <field name="res_model">hr.department</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_department_filter"/>
+            <field name="help">Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.</field>
         </record>
 
        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
@@ -84,7 +85,7 @@
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Departements Informations" groups="base.group_extended">
+                    <page string="Departments" groups="base.group_extended">
                         <field name="context_department_id" completion="1" widget="selection" string="Department"/>
                         <separator string="Managers" colspan="4"/>
                         <field name="parent_id" nolabel="1" colspan="4"/>
@@ -101,7 +102,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <page string="Current Activity" position="inside">
-                    <field name="context_department_id" widget="selection" />
+                    <field name="context_department_id" widget="selection" readonly="0"/>
                 </page>
             </field>
         </record>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index c0d388517eb..a81954bc51b 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -10,7 +10,7 @@
       <field name="arch" type="xml">
         <data>
             <form position="attributes">
-                <attribute name="string">Select Human Resources Modules To Install</attribute>
+                <attribute name="string">Human Resources Modules Configuration</attribute>
             </form>
             <separator string="title" position="attributes">
                 <attribute name="string">Select Human Resources Modules To Install</attribute>
@@ -29,6 +29,8 @@
             <field name="hr_contract"/>
             <field name="hr_evaluation"/>
             <field name="hr_attendance"/>
+            <field name="hr_payroll"/>
+            <field name="hr_payroll_account"/>
           </group>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
               <attribute name="string">Configure</attribute>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 402df16939e..6d826db1a6b 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -4,10 +4,9 @@
 
         <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
-        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="group_hr_manager"    sequence="50" />
-        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration"       groups="group_hr_manager" sequence="1" />
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees"
-            sequence="1"/>
+        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="group_hr_manager" sequence="50"/>
+        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" groups="group_hr_manager" sequence="1"/>
+        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1"/>
 
         <!--
         ==========
@@ -62,12 +61,14 @@
                             <separator string="Position" colspan="2"/>
                             <field name="job_id" widget="selection"/>
                             <field name="department_id" widget="selection"/>
-                            <field name="category_id" />
                             <!--<separator string="Managers" colspan="2"/>
                             <field name="parent_id" />
                             <field name="coach_id" />-->
                             </group>
                         </page>
+                        <page string="Categories">
+                            <field name="category_ids" nolabel="1"/>
+                        </page>
                         <page string="Notes">
                             <field colspan="4" nolabel="1" name="notes"/>
                         </page>
@@ -102,7 +103,9 @@
                 <search string="Employees">
                     <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive" groups="base.group_extended"/>
                     <field name="name"/>
-                    <field name="department_id" widget="selection"/>
+                    <field name="department_id" widget="selection">
+                    <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" help="My Departments Employee"/>
+                    </field>
                     <field name="job_id" widget="selection"/>
                     <field name="parent_id"/>
                     <newline />
@@ -144,6 +147,7 @@
             <field name="domain">[]</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
+            <field name="help">The employee directory contains all data related to your employees: from their photo up to their hourly estimated costs for the timesheets. Employees are managed by departments and can be linked to users to manage their access rights.</field>
         </record>
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
@@ -337,7 +341,12 @@
                             <field name="employee_ids" colspan='4' nolabel="1"  mode="tree,form"/>
                         </page>
                     </notebook>
-                    <field name="state"/>
+                    <group col="6" colspan="4">
+	                    <field name="state"/>
+	                    <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
+		                <button name="job_open" string="Open" states="old" type="object" icon="terp-camera_test"/>
+                        <button name="job_old" string="Old" states="open,recruit" type="object" icon="gtk-cancel"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -383,6 +392,7 @@
             <field name="res_model">hr.job</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
         </record>
 
         <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root"/>
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index a68c6d05cfc..089a82e7615 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2009-11-17 07:24+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-07-30 14:35+0000\n"
+"Last-Translator: Julien Thewys (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-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-07-31 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -57,7 +57,7 @@ msgstr "Parents"
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Nom de Modèle non valide pour la définition de l'action."
+msgstr "Nom de modèle invalide pour la définition de l'action."
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 7e8cf19c483..72e8696dbb6 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2010-02-14 11:31+0000\n"
-"Last-Translator: Paulius Sladkevičius <Unknown>\n"
+"PO-Revision-Date: 2010-07-21 07:35+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-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -31,7 +31,7 @@ msgstr "Darbo laiko kategorijos"
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr "Klaida ! Jūs negalite sukurti pasikartojančių padalinių"
+msgstr "Klaida! Negalima sukurti pasikartojančių padalinių."
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -179,7 +179,7 @@ msgstr "Pavaldiniai"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
 msgid "Reporting"
-msgstr "Ataskaitos"
+msgstr ""
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -199,7 +199,7 @@ msgstr "Užpildyti kontaktine informaciją"
 #. module: hr
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Netinkamas XML peržiūros architektūrai!"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -242,7 +242,7 @@ msgstr "Vyras"
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
 msgid "Create openerp user"
-msgstr "Sukurti OpenERP vartotoją"
+msgstr "Sukurti OpenERP naudotoją"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -366,7 +366,7 @@ msgstr "Darbovietės adresas"
 #. module: hr
 #: field:hr.employee,marital:0
 msgid "Marital Status"
-msgstr "Šeiminė padėtis"
+msgstr "Šeimyninė padėtis"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_timesheet
@@ -383,8 +383,8 @@ msgstr "Asmeninė informacija"
 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ų "
-"simbolių!"
+"Objekto pavadinimas turi prasidėti su x_ ir jame negali būti specialiųjų "
+"ženklų!"
 
 #. module: hr
 #: view:hr.timesheet:0
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index f2b4e0df5ae..fae9cf7dfc9 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:23+0000\n"
+"PO-Revision-Date: 2010-07-20 09:26+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-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -57,7 +57,7 @@ msgstr "上级"
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: hr
 #: view:hr.department:0
@@ -72,7 +72,7 @@ msgstr "员工分类"
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work Email"
-msgstr "工作电子邮件"
+msgstr "工作Email"
 
 #. module: hr
 #: field:hr.timesheet.group,name:0
@@ -136,12 +136,12 @@ msgstr "工作时间分类"
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_tree
 msgid "Employees Structure"
-msgstr "员工组织结构"
+msgstr "员工架构"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr "身份ID"
+msgstr "社保ID"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -151,7 +151,7 @@ msgstr "办公电话"
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr "子类别"
+msgstr "子类"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -179,7 +179,7 @@ msgstr "下属"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
 msgid "Reporting"
-msgstr "内部报表"
+msgstr "报表"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -199,7 +199,7 @@ msgstr "填写联系信息"
 #. module: hr
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -209,7 +209,7 @@ msgstr "离婚"
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "上级类别"
+msgstr "上级分类"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
@@ -222,7 +222,7 @@ msgstr "部门"
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "员工联系"
+msgstr "员工联系方式"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -232,7 +232,7 @@ msgstr "已婚"
 #. module: hr
 #: field:hr.timesheet,tgroup_id:0
 msgid "Employee's timesheet group"
-msgstr "员工工作时间表组"
+msgstr "员工工作时间表"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -248,7 +248,7 @@ msgstr "创建系统用户"
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "员工类型"
+msgstr "员工类别"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
@@ -258,7 +258,7 @@ msgstr "二"
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr "人力资源"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,user_id:0
@@ -310,12 +310,12 @@ msgstr "出生日期"
 #. module: hr
 #: field:hr.employee,active:0
 msgid "Active"
-msgstr "在职"
+msgstr "有效"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "错误！你不能创建递归的员工"
+msgstr "错误:你不能创建递归的员工"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
@@ -356,7 +356,7 @@ msgstr "开始日期"
 #. module: hr
 #: field:res.users,parent_id:0
 msgid "Parent Users"
-msgstr "用用户"
+msgstr "上级用户"
 
 #. module: hr
 #: field:hr.employee,address_id:0
@@ -382,7 +382,7 @@ msgstr "个人信息"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: hr
 #: view:hr.timesheet:0
@@ -404,7 +404,7 @@ msgstr "工作到"
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Other"
-msgstr "其他"
+msgstr "其它"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -434,7 +434,7 @@ msgstr "其它ID"
 #. module: hr
 #: field:hr.timesheet,name:0
 msgid "Name"
-msgstr "姓名"
+msgstr "名称"
 
 #. module: hr
 #: field:hr.employee,gender:0
@@ -461,7 +461,7 @@ msgstr "子部门"
 #. module: hr
 #: view:hr.employee:0
 msgid "Job Information"
-msgstr "职位信息"
+msgstr "工作信息"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
@@ -472,7 +472,7 @@ msgstr "填写员工联系信息"
 #: field:hr.department,manager_id:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr "上司"
+msgstr "主管"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_list_my
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 277a315edac..15bf615c920 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -46,6 +46,10 @@ class hr_installer(osv.osv_memory):
                  "performance review of employees."),
         'hr_attendance': fields.boolean('Attendances (Sign In/Out)',
             help="Simplifies the management of employee attendances."),
+        'hr_payroll': fields.boolean('Payroll',
+            help="Generic Payroll system"),
+        'hr_payroll_account': fields.boolean('Payroll Accounting',
+            help="Generic Payroll system Integrated with Accountings."),
         }
     _defaults = {
         'hr_holidays': True,
diff --git a/addons/hr/test/test_hr.yml b/addons/hr/test/test_hr.yml
index 74d7c8de8d1..c147bf8ca7b 100644
--- a/addons/hr/test/test_hr.yml
+++ b/addons/hr/test/test_hr.yml
@@ -1,68 +1,63 @@
-- |
+-
   In order to test  hr module in OpenERP, I will create new Employee , Department and Job Position.
 -
-  |
-  I create "R & D" Department  in Department form.
-- 
+  I create "R&D Department"  in Department form.
+-
   !record {model: hr.department, id: hr_department_rd0}:
     manager_id: base.user_root
-    name: 'R & D '
--     
-  |
-  Now, I  create a new employee “Mark Johnson”.
-  select "R & D" Department  which I had created.    
+    name: 'R & D'
 -
-  !record {model: hr.employee, id: hr_employee_employee0}:
+  Now, I  create a new employee “Mark Johnson”, and select department as "R&D Department".
+-
+  !record {model: hr.employee, id: hr_employee_mark}:
     address_home_id: base.res_partner_address_1
     company_id: base.main_company
     gender: male
     marital: hr.hr_employee_marital_status_single
-    name: employee1
+    name: Mark Johnson
     user_id: base.user_root
     department_id: 'hr_department_rd0'
-
-- |
-  In order to check the wizard “Employee Hierarchy” , I will create new employee “Phil Graves ” and select "Mark Johnson" as 
-  Manager.    
-- 
-  !record {model: hr.employee, id: hr_employee_employee1}:
+-
+  In order to check the wizard “Employee Hierarchy” , I will create new employee “Phil Graves ” and select "Mark Johnson" as
+  Manager.
+-
+  !record {model: hr.employee, id: hr_employee_phil}:
     address_home_id: base.res_partner_address_3000
     company_id: base.main_company
     gender: male
-    name: employee2
+    name: Phil Graves
     user_id: base.user_demo
-    parent_id: 'hr_employee_employee0'
-- |
+    parent_id: 'hr_employee_mark'
+-
   I will open up form view of  “Mark Johnson” and test the wizard “Employee Hierarchy” so it display the employee
-  hierarchy starting from “Mark Johnson”. 
-       
-- |
+  hierarchy starting from “Mark Johnson”.
+
+-
   I will create new Job Position. I will check successfull creation of new Job Position by adding the information.
-- 
+-
   !record {model: hr.job, id: hr_job_jea0}:
     department_id: 'hr_department_rd0'
-    description: 'Position of Junier Application Engineer '
+    description: 'Position of Junior Application Engineer'
     expected_employees: 5
-    name: 'JEA '
-- |
+    name: 'JAE'
+-
   I check that Employee form is in "Open" state.
 -
   !assert {model: hr.job, id: hr_job_jea0}:
-    - state == 'open'  
-    
-- |
+    - state == 'open'
+
+-
   I create Employee for job position.
-- 
+-
   !record {model: hr.job, id: hr_job_jea0}:
     employee_ids:
       - address_home_id: base.res_partner_address_1
         name: Manuel Lehba
         department_id: 'hr_department_rd0'
         gender: male
-        parent_id: 'hr_employee_employee0'
-- |
-  I check that "Number of Employees" field have some value.     
+        parent_id: 'hr_employee_mark'
+-
+  I check that "Number of Employees" field have some value.
 -
   !assert {model: hr.job, id: hr_job_jea0}:
-    - no_of_employee != False       
-        
\ No newline at end of file
+    - no_of_employee != False
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index e31773fb314..383f1dfa8b1 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -29,7 +29,7 @@
     Keeps account of the attendances of the employees on the basis of the
     actions(Sign in/Sign out) performed by them.
        """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base', 'hr'],
     'update_xml': [
         'security/hr_security.xml',
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index b8892837310..938df72d4e9 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -37,7 +37,9 @@ class hr_action_reason(osv.osv):
 hr_action_reason()
 
 def _employee_get(obj, cr, uid, context=None):
-    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
+    if context is None:
+        context = {}
+    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
     if ids:
         return ids[0]
     return False
@@ -47,6 +49,8 @@ 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'))
@@ -60,7 +64,7 @@ class hr_attendance(osv.osv):
         'day': fields.function(_day_compute, method=True, type='char', string='Day', store=True, select=1, size=32),
     }
     _defaults = {
-        'name': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'name': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), #Don't remove the lambda, if you remove it then the current time will not change
         'employee_id': _employee_get,
     }
 
@@ -89,6 +93,8 @@ class hr_employee(osv.osv):
     _description = "Employee"
 
     def _state(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         result = {}
         for id in ids:
             result[id] = 'absent'
@@ -112,13 +118,19 @@ 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 = {}
 
         #Special case when button calls this method :type=context
         if isinstance(type, dict):
@@ -127,7 +139,6 @@ class hr_employee(osv.osv):
             warning_sign = "Sign In"
         elif type == 'sign_out':
             warning_sign = "Sign Out"
-
         for emp in self.read(cr, uid, ids, ['id'], context=context):
             if not self._action_check(cr, uid, emp['id'], dt, context):
                 raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
@@ -136,7 +147,7 @@ class hr_employee(osv.osv):
 
             if dt:
                 res['name'] = dt
-            id = self.pool.get('hr.attendance').create(cr, uid, res, context=context)
+            id = obj_attendance.create(cr, uid, res, context=context)
 
         if type != 'action':
             return id
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 08331823667..f6d7365356f 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -71,10 +71,9 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_employee":1}</field>
             <field name="search_view_id" ref="view_hr_attendance_filter" />
+            <field name="help">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 attndance machine using OpenERP's webservices features.</field>
         </record>
 
-        <!--<menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"
-            groups="group_hr_attendance"/>-->
         <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3"/>
         <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking"       groups="hr.group_hr_manager" sequence="3"/>
 
diff --git a/addons/hr_attendance/i18n/it.po b/addons/hr_attendance/i18n/it.po
index 657a7385ba2..58810049fda 100644
--- a/addons/hr_attendance/i18n/it.po
+++ b/addons/hr_attendance/i18n/it.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2009-09-08 15:55+0000\n"
-"Last-Translator: Mario Riva <mario.riva@domsense.com>\n"
+"PO-Revision-Date: 2010-07-15 07:49+0000\n"
+"Last-Translator: Salvatore Udda <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-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-07-16 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -97,7 +97,7 @@ msgstr "Stampa Rapporto Errori Presenze"
 #. module: hr_attendance
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome di modello non valido nella definizione dell'azione."
 
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.print_week
@@ -140,17 +140,17 @@ msgstr "Motivi Azione"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
 #. module: hr_attendance
 #: wizard_field:hr.si_so,so_ask_si,last_time:0
@@ -160,7 +160,7 @@ msgstr "Ultima Entrata"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "June"
-msgstr ""
+msgstr "Giugno"
 
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.print_month
@@ -203,7 +203,7 @@ msgstr "Data"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "July"
-msgstr ""
+msgstr "Luglio"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,si_ask_so:0
@@ -238,12 +238,12 @@ msgstr "Assente"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "February"
-msgstr ""
+msgstr "Febbraio"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "October"
-msgstr ""
+msgstr "Ottobre"
 
 #. module: hr_attendance
 #: wizard_field:hr.si_so,si_ask_so,last_time:0
@@ -285,12 +285,12 @@ msgstr "Stato Attuale"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "January"
-msgstr ""
+msgstr "Gennaio"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprile"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
@@ -324,7 +324,7 @@ msgstr "Motivazioni Presenza"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: hr_attendance
 #: wizard_view:hr.attendance.report,init:0
@@ -334,7 +334,7 @@ msgstr ""
 #. module: hr_attendance
 #: wizard_field:hr.attendance.report,init,max_delay:0
 msgid "Max. Delay (Min)"
-msgstr ""
+msgstr "Ritardo Massimo (min.)"
 
 #. module: hr_attendance
 #: wizard_view:hr.attendance.print_week,init:0
@@ -359,12 +359,12 @@ msgstr ""
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "September"
-msgstr ""
+msgstr "Settembre"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "December"
-msgstr ""
+msgstr "Dicembre"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -374,12 +374,12 @@ msgstr "Presenza Dipendente"
 #. module: hr_attendance
 #: wizard_view:hr.attendance.print_month,init:0
 msgid "Select a month"
-msgstr ""
+msgstr "Selezionare un mese"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_month,init,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mese"
 
 #. module: hr_attendance
 #: model:ir.module.module,description:hr_attendance.module_meta_information
@@ -394,7 +394,7 @@ msgstr "Report Errori Presenze"
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_month,init,year:0
 msgid "Year"
-msgstr ""
+msgstr "Anno"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.print_month,init,end:0
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index 7f0a7d101d8..1f82a102028 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:23+0000\n"
+"PO-Revision-Date: 2010-07-20 10:01+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-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -35,7 +35,7 @@ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 #: model:ir.actions.wizard,name:hr_attendance.si_so
 #: model:ir.ui.menu,name:hr_attendance.menu_si_so
 msgid "Sign in / Sign out"
-msgstr "签出"
+msgstr "签入/ 签出"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
@@ -51,12 +51,12 @@ msgstr "员工出勤"
 #. module: hr_attendance
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,init:0
 msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr "你现在出勤跟踪准备签入/签出"
+msgstr "你现在准备签入或签出"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -68,14 +68,14 @@ msgstr "签出"
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Delay"
-msgstr "延迟"
+msgstr "推延"
 
 #. module: hr_attendance
 #: wizard_field:hr.si_so,init,name:0
 #: wizard_field:hr.si_so,si_ask_so,name:0
 #: wizard_field:hr.si_so,so_ask_si,name:0
 msgid "Employee's name"
-msgstr "员工名"
+msgstr "员工姓名"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.print_month,init,print:0
@@ -86,12 +86,12 @@ msgstr "打印时间表"
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.wizard_attendance_error
 msgid "Print Attendance Error Report"
-msgstr "出勤错误报表"
+msgstr "打印出勤错误报表"
 
 #. module: hr_attendance
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.print_week
@@ -107,7 +107,7 @@ msgstr "员工"
 #: wizard_view:hr.attendance.print_week,init:0
 #: wizard_view:hr.attendance.report,init:0
 msgid "Select a time span"
-msgstr "选择一时间长度"
+msgstr "选择时间长度"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
@@ -129,22 +129,22 @@ msgstr "总周期:"
 #: field:hr.attendance,action_desc:0
 #: model:ir.model,name:hr_attendance.model_hr_action_reason
 msgid "Action reason"
-msgstr "行动理由"
+msgstr "动作理由"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: hr_attendance
 #: wizard_field:hr.si_so,so_ask_si,last_time:0
@@ -154,7 +154,7 @@ msgstr "你最近的签入"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.print_month
@@ -180,7 +180,7 @@ msgstr "原因"
 #. module: hr_attendance
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr "错误签入前先签出同样签出前先签入"
+msgstr "错误: 签入前先签出同样签出前先签入"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
@@ -195,14 +195,14 @@ msgstr "日期"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,si_ask_so:0
 msgid ""
 "You did not signed out the last time. Please enter the date and time you "
 "signed out."
-msgstr "最近没有签到请输入签到的日期和时间"
+msgstr "你最近没有签出的最后时间, 请输入签出的日期和时间"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -228,12 +228,12 @@ msgstr "缺勤"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: hr_attendance
 #: wizard_field:hr.si_so,si_ask_so,last_time:0
@@ -243,17 +243,17 @@ msgstr "你最近的签出"
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
-msgstr "主要延迟"
+msgstr "主要推延"
 
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
 msgid "Action's type"
-msgstr "行动；类型"
+msgstr "动作类型"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr "出勤原因"
+msgstr "定义出勤原因"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -275,12 +275,12 @@ msgstr "当前状态"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
@@ -298,12 +298,12 @@ msgstr "出勤错误"
 #: field:hr.attendance,action:0
 #: selection:hr.attendance,action:0
 msgid "Action"
-msgstr "行动"
+msgstr "动作"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.report,init,print:0
 msgid "Print Attendance Report"
-msgstr "出勤报表"
+msgstr "打印出勤报表"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
@@ -314,17 +314,17 @@ msgstr "出勤原因"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. module: hr_attendance
 #: wizard_view:hr.attendance.report,init:0
 msgid "Bellow this delay, the error is considered to be voluntary"
-msgstr "延迟错误被认为是自动的"
+msgstr "Bellow这种推延, 这错误被认为是自愿的"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.report,init,max_delay:0
 msgid "Max. Delay (Min)"
-msgstr "最大延迟(最小)"
+msgstr "最大推延(最小)"
 
 #. module: hr_attendance
 #: wizard_view:hr.attendance.print_week,init:0
@@ -342,17 +342,17 @@ msgstr "结束日期"
 msgid ""
 "You did not signed in the last time. Please enter the date and time you "
 "signed in."
-msgstr "你在最近没有签到请输入签到的日期和时间"
+msgstr "你没有签入的最后时间, 请输入签入的日期和时间"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -367,7 +367,7 @@ msgstr "选择月份"
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_month,init,month:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: hr_attendance
 #: model:ir.module.module,description:hr_attendance.module_meta_information
@@ -382,7 +382,7 @@ msgstr "出勤错误报表"
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_month,init,year:0
 msgid "Year"
-msgstr "年"
+msgstr "年份"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.print_month,init,end:0
diff --git a/addons/hr_attendance/report/__init__.py b/addons/hr_attendance/report/__init__.py
index 9b27aeb24ae..faa57ad2e95 100644
--- a/addons/hr_attendance/report/__init__.py
+++ b/addons/hr_attendance/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,12 +15,12 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import attendance_errors
-import bymonth
+import attendance_by_month
 import timesheet
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/report/bymonth.py b/addons/hr_attendance/report/attendance_by_month.py
similarity index 96%
rename from addons/hr_attendance/report/bymonth.py
rename to addons/hr_attendance/report/attendance_by_month.py
index fc646e089ac..0710d30faaf 100644
--- a/addons/hr_attendance/report/bymonth.py
+++ b/addons/hr_attendance/report/attendance_by_month.py
@@ -40,12 +40,13 @@ def hour2str(h):
 class report_custom(report_rml):
 
     def create_xml(self, cr, uid, ids, datas, context=None):
+        obj_emp = pooler.get_pool(cr.dbname).get('hr.employee')
         if context is None:
             context = {}
         month = DateTime.DateTime(datas['form']['year'], datas['form']['month'], 1)
         user_xml = ['<month>%s</month>' % month2name[month.month], '<year>%s</year>' % month.year]
         for employee_id in ids:
-            emp = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, [employee_id], ['name'])[0]
+            emp = obj_emp.read(cr, uid, [employee_id], ['name'])[0]
             stop, days_xml = False, []
             user_repr = '''
             <user>
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 8b5bbdff5e7..94dc1edcbbd 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -37,6 +37,7 @@ def to_hour(h):
 class report_custom(report_rml):
 
     def create_xml(self, cr, uid, ids, datas, context=None):
+        obj_emp = pooler.get_pool(cr.dbname).get('hr.employee')
         start_date = DateTime.strptime(datas['form']['init_date'], '%Y-%m-%d')
         end_date = DateTime.strptime(datas['form']['end_date'], '%Y-%m-%d')
         first_monday = start_date - DateTime.RelativeDateTime(days=start_date.day_of_week)
@@ -47,7 +48,7 @@ class report_custom(report_rml):
         user_xml = []
 
         for employee_id in ids:
-            emp = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, [employee_id], ['id', 'name'])[0]
+            emp = obj_emp.read(cr, uid, [employee_id], ['id', 'name'])[0]
             monday, n_monday = first_monday, first_monday + one_week
             stop, week_xml = False, []
             user_repr = '''
diff --git a/addons/hr_attendance/test/test_hr_attendance.yml b/addons/hr_attendance/test/test_hr_attendance.yml
index 5c1132525f5..e4a08476985 100644
--- a/addons/hr_attendance/test/test_hr_attendance.yml
+++ b/addons/hr_attendance/test/test_hr_attendance.yml
@@ -1,8 +1,8 @@
-- |
-  In order to test hr_attendance module in OpenERP,  I create new attendance and perform Sign In/Sign Out operation.
-  
-- |
-  First I create Employee "Mark Johnson".
+-
+  In order to test hr_attendance module in OpenERP,  I will first create new attendance reasons and perform Sign In/Sign Out operations.
+
+-
+  I create a new employee "Mark Johnson".
 -
   !record {model: hr.employee, id: hr_employee_employee0}:
     address_home_id: base.res_partner_address_1
@@ -10,56 +10,56 @@
     gender: male
     name: Mark Johnson
     user_id: base.user_root
-    
-- |
-  Given that I have Attendance Reason "Good Morning" for Sign In.
-- 
-  !record {model: hr.action.reason, id: hr_action_reason_goodmorning0}:
-    name: Good Morning
+
+-
+  I create a new attendance reason "Login" for Sign In.
+-
+  !record {model: hr.action.reason, id: hr_action_reason_login0}:
+    name: Login
     action_type: sign_in
-- |
-  I also create another Attendance Reason for Sign Out.
-- 
-  !record {model: hr.action.reason, id: hr_action_reason_goodnight0}:
-    name: Good Night
+-
+  I create second attendance reason "Logout" for Sign Out.
+-
+  !record {model: hr.action.reason, id: hr_action_reason_logout0}:
+    name: Logout
     action_type: sign_out
-- |
-  Now , When I came in office , I create Atendances and perform "Sign In" action with proper reason.
-- 
+-
+  Now, at the time of login, I create an attendance with "Sign In" action and proper reason.
+-
   !record {model: hr.attendance, id: hr_attendance_0}:
     action: sign_in
-    action_desc: 'hr_action_reason_goodmorning0'
+    action_desc: 'hr_action_reason_login0'
     employee_id: 'hr_employee_employee0'
     name: '2010-05-18 19:08:08'
-- |
-  I check that Employee  is in "Present" state.
 -
-  !assert {model: hr.employee, id: hr_employee_employee0}: 
+  I check that Employee state is "Present".
+-
+  !assert {model: hr.employee, id: hr_employee_employee0}:
     - state == 'present'
-          
-- |
-  When I left office , I create attendance and perform "Sign Out".      	
-- 
+
+-
+  At the time of logout, I create an attendance with "Sign Out" action.
+-
   !record {model: hr.attendance, id: hr_attendance_1}:
     action: sign_out
     employee_id: 'hr_employee_employee0'
     name: '2010-05-18 19:10:55'
-- |
-  I check that Employee  is in "Absent" state.
 -
-  !assert {model: hr.employee, id: hr_employee_employee0}: 
-    - state == 'absent'      
+  I check that Employee state is Absent.
+-
+  !assert {model: hr.employee, id: hr_employee_employee0}:
+    - state == 'absent'
 
-- |
-  I can also fill my attendance using "Sign In/Sign Out" wizard.
-- 
+-
+  I will use "Sign In/Sign Out" wizard for attendances.
+-
   !record {model: hr.sign.in.out, id: hr_sign_in_out_markjohnson0}:
     name: Mark Johnson
     state: absent
-     
-- | 
-  I click on "Sign In" button of this wizard to perform present action.
-- 
+
+-
+  I click on "Sign In" button of this wizard to login.
+-
  !python {model: hr.sign.in.out}: |
     obj_attendance = self.pool.get('hr.employee')
     emp_id = obj_attendance.search(cr, uid, [('user_id', '=', uid), ('name', '=', "Mark Johnson")])
@@ -68,21 +68,21 @@
     	self.write(cr, uid, [ref('hr_sign_in_out_markjohnson0')], {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0]})
     	self.si_check(cr, uid, [ref("hr_sign_in_out_markjohnson0")], {"active_id": ref("hr_employee_employee0")})
 
-- |
-  I check that Employee  is  in "Present" state.
+-
+  I check that Employee state is "Present".
 -
   !assert {model: hr.employee, id: hr_employee_employee0}:
-    - state == 'present'    
-    
-- |
-  I forgot to "Sign Out" in Yesterday  and want to sign in Today  using This wizard.
-- 
+    - state == 'present'
+
+-
+  I forgot to "Sign Out" Yesterday and want to sign in Today using This wizard.
+-
   !record {model: hr.sign.in.out, id: hr_sign_in_out_markjohnson0}:
     name: Mark Johnson
     state: present
-- |
-  I click on "Sign In" button of this wizard. that will Open new form which ask for Last Sign Out date. 
-- 
+-
+  I click on "Sign In" button of this wizard, this will Open a new form which ask for Last Sign Out date.
+-
  !python {model: hr.sign.in.out}: |
     obj_attendance = self.pool.get('hr.employee')
     emp_id = obj_attendance.search(cr, uid, [('user_id', '=', uid), ('name', '=', "Mark Johnson")])
@@ -90,15 +90,15 @@
         employee = obj_attendance.read(cr, uid, emp_id)[0]
         self.write(cr, uid, [ref('hr_sign_in_out_markjohnson0')], {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0]})
         self.si_check(cr, uid, [ref("hr_sign_in_out_markjohnson0")])
-- |
-  I select Last Sign Out date in "hr sign out ask" wizard.
-- 
+-
+  I select Last Sign Out date.
+-
   !record {model: hr.sign.in.out.ask, id: hr_sign_in_out_ask_markjohnson0}:
     last_time: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    name: Mark Johnson  
-- | 
-  Now I click on "Sign In" button of this wizard.  
-- 
+    name: Mark Johnson
+-
+  Now I click on "Sign In" button of this wizard.
+-
   !python {model: hr.sign.in.out.ask}: |
     obj_attendance = self.pool.get('hr.employee')
     emp_id = obj_attendance.search(cr, uid, [('user_id', '=', uid), ('name', '=', "Mark Johnson")])
@@ -106,4 +106,11 @@
         employee = obj_attendance.read(cr, uid, emp_id)[0]
         self.write(cr, uid, [ref('hr_sign_in_out_ask_markjohnson0')], {'emp_id': emp_id[0]})
         #self.sign_in(cr, uid, [ref("hr_sign_in_out_ask_markjohnson0")], {"active_ids": [ref("hr_attendance.menu_hr_attendance_sigh_in_out")]})
-  
\ No newline at end of file
+
+-
+  Finally i will check the state of the employee is present.
+-
+  !record {model: hr.sign.in.out, id: hr_sign_in_out_markjohnson0}:
+    name: Mark Johnson
+    state: present
+
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 6518202ac36..b7a9a8afab5 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -23,7 +23,7 @@
         </record>
 
         <record id="action_hr_attendance_month" model="ir.actions.act_window">
-            <field name="name">Print Timesheet by month</field>
+            <field name="name">Print Attendance by month</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.attendance.month</field>
             <field name="view_type">form</field>
@@ -34,7 +34,7 @@
 		<record model="ir.values" id="hr_attendance_month_values">
             <field name="model_id" ref="hr.model_hr_employee" />
             <field name="object" eval="1" />
-            <field name="name">Print Timesheet by month</field>
+            <field name="name">Print Attendance by month</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_attendance_month'))" />
             <field name="key">action</field>
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek.py b/addons/hr_attendance/wizard/hr_attendance_byweek.py
index 9ef48f29fff..175ebf8a228 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek.py
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek.py
@@ -35,6 +35,8 @@ 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_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index 1e536334675..ed7ff7a8bc7 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-		<record id="view_hr_attendance_week" model="ir.ui.view">
+	<!--<record id="view_hr_attendance_week" model="ir.ui.view">
             <field name="name">Attendance Report Week</field>
             <field name="model">hr.attendance.week</field>
             <field name="type">form</field>
@@ -40,7 +40,7 @@
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_attendance_week'))" />
             <field name="key">action</field>
             <field name="model">hr.employee</field>
-        </record>
+        </record> -->
 
 	</data>
 </openerp>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error.py b/addons/hr_attendance/wizard/hr_attendance_error.py
index 62689705c17..449fc4ca5c2 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error.py
+++ b/addons/hr_attendance/wizard/hr_attendance_error.py
@@ -42,14 +42,14 @@ class hr_attendance_error(osv.osv_memory):
         if context is None:
             context = {}
         emp_ids = []
-        data_error = self.read(cr, uid, ids)[0]
+        data_error = self.read(cr, uid, ids, context=context)[0]
         date_from = data_error['init_date']
         date_to = data_error['end_date']
         cr.execute("select id from hr_attendance where employee_id IN %s and to_char(name,'YYYY-mm-dd')<=%s and to_char(name,'YYYY-mm-dd')>=%s and action IN %s order by name" ,(tuple(context['active_ids']), date_to, date_from, tuple(['sign_in','sign_out'])))
         attendance_ids = [x[0] for x in cr.fetchall()]
         if not attendance_ids:
             raise osv.except_osv(_('No Data Available'), _('No records found for your selection!'))
-        attendance_records = self.pool.get('hr.attendance').browse(cr, uid, attendance_ids)
+        attendance_records = self.pool.get('hr.attendance').browse(cr, uid, attendance_ids, context=context)
 
         for rec in attendance_records:
             if rec.employee_id.id not in emp_ids:
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 7ffd94dbca5..5ac041d7a42 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -53,11 +53,15 @@ class hr_si_so_ask(osv.osv_memory):
                  }
 
     def sign_in(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [])[0]
+        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):
-        data = self.read(cr, uid, ids, [])[0]
+        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)
 
 hr_si_so_ask()
@@ -74,6 +78,8 @@ 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]
@@ -81,6 +87,8 @@ 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)
@@ -89,10 +97,12 @@ 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')
-        data = self.read(cr, uid, ids, [])[0]
+        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')
-        last_att = att_obj.browse(cr, uid, att_id)
+        last_att = att_obj.browse(cr, uid, att_id, context=context)
         if last_att:
             last_att = last_att[0]
         cond = not last_att or last_att.action == 'sign_out'
@@ -113,8 +123,10 @@ 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')
-        data = self.read(cr, uid, ids, [])[0]
         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')
         last_att = att_obj.browse(cr, uid, att_id, context=context)
@@ -137,8 +149,8 @@ class hr_sign_in_out(osv.osv_memory):
         if cond:
             return self.sign_out(cr, uid, data, context)
         else:
-            model_data_ids = self.pool.get('ir.model.data').search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_hr_attendance_si_ask')], context=context)
-            resource_id = self.pool.get('ir.model.data').read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+            model_data_ids = att_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_hr_attendance_si_ask')], context=context)
+            resource_id = att_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
             return {
                 'name': _('Sign in / Sign out'),
                 'view_type': 'form',
@@ -150,12 +162,14 @@ class hr_sign_in_out(osv.osv_memory):
             }
 
     def sign_in(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'):
                 raise osv.except_osv(_('UserError'), _('The sign-out date must be in the past'))
             self.pool.get('hr.attendance').create(cr, uid, {'name': data['last_time'], 'action': 'sign_out',
-                'employee_id': emp_id})
+                'employee_id': emp_id}, context=context)
         try:
             success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
         except:
@@ -163,11 +177,13 @@ 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'):
                 raise osv.except_osv(_('UserError'), _('The Sign-in date must be in the past'))
-            self.pool.get('hr.attendance').create(cr, uid, {'name':data['last_time'], 'action':'sign_in',  'employee_id':emp_id})
+            self.pool.get('hr.attendance').create(cr, uid, {'name':data['last_time'], 'action':'sign_in',  'employee_id':emp_id}, context=context)
         try:
             success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
         except:
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index edcdf55091f..ff366fcbce9 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -43,6 +43,7 @@
             <field name="view_mode">tree,form</field>
            <field name="view_id" ref="view_hr_attendance_sigh_in_out"/>
            <field name="target">new</field>
+           <field name="help">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.</field>
         </record>
 
         <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index a649a53478a..949485fa03b 100755
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@
     * Place of birth, birth date, ...
     You can assign several contracts per employee.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['hr'],
     'init_xml': ['hr_contract_data.xml'],
diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po
index 7c5d4087cc2..4c7ab9930f4 100644
--- a/addons/hr_contract/i18n/ru.po
+++ b/addons/hr_contract/i18n/ru.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-08 19:44+0000\n"
-"Last-Translator: Vadim Peretokin <vperetokin@gmail.com>\n"
+"PO-Revision-Date: 2010-07-14 08:14+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-06-22 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -38,7 +38,7 @@ msgstr ""
 #: view:hr.contract:0
 #: view:hr.employee:0
 msgid "Generalities"
-msgstr ""
+msgstr "Общее положение"
 
 #. module: hr_contract
 #: field:hr.employee,children:0
@@ -73,7 +73,7 @@ msgstr "Сумма на руки"
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
 msgid "Human Resources Contracts"
-msgstr ""
+msgstr "Договор с содрудником"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,factor_days:0
@@ -189,7 +189,7 @@ msgstr "Зарплатный период"
 #. module: hr_contract
 #: field:hr.employee,audiens_num:0
 msgid "AUDIENS Number"
-msgstr ""
+msgstr "Номер посещения"
 
 #. module: hr_contract
 #: view:hr.contract:0
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
index 0d01b8b774b..ab8d00716cf 100644
--- a/addons/hr_contract/i18n/zh_CN.po
+++ b/addons/hr_contract/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:26+0000\n"
+"PO-Revision-Date: 2010-07-20 10:15+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-06-22 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Hourly cost computation"
-msgstr "小时数成本计算"
+msgstr "每小时成本计算"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
@@ -46,7 +46,7 @@ msgstr "下级数"
 #. module: hr_contract
 #: field:hr.contract.wage.type,factor_type:0
 msgid "Factor for hour cost"
-msgstr "小时成本系数"
+msgstr "每小时成本系数"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -56,7 +56,7 @@ msgstr "工资类型"
 #. module: hr_contract
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义使用了无效的模块名。"
 
 #. module: hr_contract
 #: field:hr.contract,employee_id:0
@@ -66,7 +66,7 @@ msgstr "员工"
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Net"
-msgstr "净"
+msgstr "净值"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
@@ -81,7 +81,7 @@ msgstr "周期的小时数"
 #. module: hr_contract
 #: field:hr.contract,function:0
 msgid "Function"
-msgstr "功能"
+msgstr "职能"
 
 #. module: hr_contract
 #: field:hr.employee,marital_status:0
@@ -95,7 +95,7 @@ msgstr "婚姻状况"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Miscelleanous"
-msgstr "其他"
+msgstr "杂项"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -119,7 +119,7 @@ msgstr "工资类型"
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,name:0
 msgid "Period Name"
-msgstr "周期名"
+msgstr "周期名称"
 
 #. module: hr_contract
 #: model:ir.model,name:hr_contract.model_hr_employee_marital_status
@@ -154,7 +154,7 @@ msgstr "结束日期"
 #. module: hr_contract
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -213,7 +213,7 @@ msgstr "出生地"
 #. module: hr_contract
 #: field:hr.employee,manager:0
 msgid "Manager"
-msgstr "管理"
+msgstr "经理"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type.period:0
diff --git a/addons/hr_contract/test/test_hr_contract.yml b/addons/hr_contract/test/test_hr_contract.yml
index cbcc7e67fda..084e45620a4 100644
--- a/addons/hr_contract/test/test_hr_contract.yml
+++ b/addons/hr_contract/test/test_hr_contract.yml
@@ -1,9 +1,8 @@
-- |
-  In order to test hr_contract module in OpenERP,   
-  I will create contract for "Mark Johnson" employee.
-  
-- |
-  I create Employee "Mark Johnson" to assign contract.
+-
+  In order to test hr_contract module in OpenERP, I will create a new employee and create contract for the same.
+
+-
+  I create a new employee "Mark Johnson".
 -
   !record {model: hr.employee, id: hr_employee_employee0}:
     address_home_id: base.res_partner_address_1
@@ -11,29 +10,31 @@
     gender: male
     name: Mark Johnson
     user_id: base.user_root
-    
-- |
-  Given that I have Contract wage period "monthly" and 
-  specify "hours in period" is "176.00"
-- 
+    children: 2
+    marital: hr.hr_employee_marital_status_married
+    place_of_birth: Belgium
+    vehicle: 'No'
+    vehicle_distance: 12
+
+
+-
+  I create a new Contract wage period.
+-
   !record {model: hr.contract.wage.type.period, id: hr_contract_wage_type_period_monthly0}:
-    factor_days: 178.0
+    factor_days: 176.0
     name: monthly
-- |
-  Given that I have Contract wage type "Monthly Gross Wage". 
-  select wage period "monthly" and type "Gross". with hour cost "1.9" 
-- 
+-
+  I create a new Contract Wage Type.
+-
   !record {model: hr.contract.wage.type, id: hr_contract_wage_type_monthlygrosswage0}:
     factor_type: 1.9
     name: Monthly Gross Wage
     period_id: 'hr_contract_wage_type_period_monthly0'
     type: gross
-       
-- |
-  Now I start by creating  contract for "Mark Johnson".
-  Select wage type "Monthly Gross Wage" and Wage period "monthly" 
-  which I had given.
-- 
+
+-
+  I create a new contract for "Mark Johnson".
+-
   !record {model: hr.contract, id: hr_contract_contract0}:
     advantages_gross: 0.0
     employee_id: 'hr_employee_employee0'
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 9292b10fd4c..9710a84b4d7 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Human Resources Evaluation",
     "version": "0.1",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "category": "Generic Modules/Human Resources",
     "website": "http://www.openerp.com",
     "depends": ["hr",'hr_recruitment','survey'],
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 429b492131d..21ca0423c9a 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -104,18 +104,22 @@ 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 (dt.ISO.ParseAny(id.evaluation_date) + dt.RelativeDateTime(months = int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
                     self.write(cr, uid, id.id, {'evaluation_date' : (dt.ISO.ParseAny(id.evaluation_date) + dt.RelativeDateTime(months =+ int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d')}, context=context)
-                    self.pool.get("hr_evaluation.evaluation").create(cr, uid, {'employee_id' : id.id, 'plan_id': id.evaluation_plan_id}, context)
+                    obj_evaluation.create(cr, uid, {'employee_id' : id.id, 'plan_id': id.evaluation_plan_id}, context=context)
         return True
 
     def onchange_evaluation_plan_id(self, cr, uid, ids, evaluation_plan_id, evaluation_date, context=None):
         evaluation_date = evaluation_date or False
         evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
+        obj_evaluation = self.pool.get('hr_evaluation.evaluation')
+        if context is None:
+            context = {}
         if evaluation_plan_id:
             flag = False
             evaluation_plan =  evaluation_plan_obj.browse(cr, uid, [evaluation_plan_id], context=context)[0]
@@ -131,9 +135,11 @@ 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)
+            obj_evaluation.create(cr, uid, {'employee_id' : id, 'plan_id': vals['evaluation_plan_id']}, context=context)
         return id
 
 hr_employee()
@@ -173,10 +179,12 @@ class hr_evaluation(osv.osv):
         'state' : lambda *a: 'draft',
     }
 
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         if not len(ids):
             return []
-        reads = self.browse(cr, uid, ids, context)
+        reads = self.browse(cr, uid, ids, context=context)
         res = []
         for record in reads:
             name = record.plan_id.name
@@ -185,6 +193,8 @@ class hr_evaluation(osv.osv):
 
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
         employee_obj=self.pool.get('hr.employee')
+        if context is None:
+            context = {}
         evaluation_plan_id=''
         if employee_id:
             for employee in employee_obj.browse(cr, uid, [employee_id], context=context):
@@ -194,8 +204,11 @@ class hr_evaluation(osv.osv):
         return {'value': {'plan_id':evaluation_plan_id}}
 
     def button_plan_in_progress(self, cr, uid, ids, context=None):
+        hr_eval_inter_obj = self.pool.get('hr.evaluation.interview')
+        if context is None:
+            context = {}
         apprai_id = []
-        for evaluation in self.browse(cr, uid, ids, context):
+        for evaluation in self.browse(cr, uid, ids, context=context):
             wait = False
             for phase in evaluation.plan_id.phase_ids:
                 childs = []
@@ -210,7 +223,6 @@ class hr_evaluation(osv.osv):
                     if not child.user_id:
                         continue
 
-                    hr_eval_inter_obj = self.pool.get('hr.evaluation.interview')
                     int_id = hr_eval_inter_obj.create(cr, uid, {
                         'evaluation_id': evaluation.id,
                         'survey_id': phase.survey_id.id,
@@ -235,18 +247,24 @@ class hr_evaluation(osv.osv):
         return True
 
     def button_final_validation(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state':'progress'})
         request_obj = self.pool.get('hr.evaluation.interview')
-        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)):
+        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)):
                 raise osv.except_osv(_('Warning !'),_("You cannot change state, because some appraisal in waiting answer or draft state"))
         return True
 
     def button_done(self,cr, uid, ids, context=None):
-        self.write(cr,uid,ids,{'state':'done', 'date_close': time.strftime('%Y-%m-%d')}, context=context)
+        if context is None:
+            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
 
@@ -277,20 +295,22 @@ class hr_evaluation_interview(osv.osv):
         }
 
     def survey_req_waiting_answer(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
+        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 = {}
-        hr_eval_obj = self.pool.get('hr_evaluation.evaluation')
         for id in self.browse(cr, uid, ids, context=context):
             flag = False
             wating_id = 0
             tot_done_req = 0
             if not id.evaluation_id.id:
                 raise osv.except_osv(_('Warning !'),_("You cannot start evaluation without Evaluation."))
-            records = hr_eval_obj.browse(cr, uid, [id.evaluation_id.id],context=context)[0].survey_request_ids
+            records = hr_eval_obj.browse(cr, uid, [id.evaluation_id.id], context=context)[0].survey_request_ids
             for child in records:
                 if child.state == "draft" :
                     wating_id = child.id
@@ -300,16 +320,20 @@ class hr_evaluation_interview(osv.osv):
                 else :
                     tot_done_req += 1
             if not flag and wating_id:
-                self.survey_req_waiting_answer(cr, uid, [wating_id], context)
+                self.survey_req_waiting_answer(cr, uid, [wating_id], context=context)
             hr_eval_obj.write(cr, uid, [id.evaluation_id.id], {'progress': tot_done_req * 100 / len(records)}, context=context)
-        self.write(cr, uid, ids, { 'state': 'done'})
+        self.write(cr, uid, ids, { 'state': 'done'}, context=context)
         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
 
@@ -326,7 +350,7 @@ class hr_evaluation_interview(osv.osv):
         """
         if not context:
             context = {}
-        record = self.browse(cr, uid, ids, 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)
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 1147483f8fd..2c5b290b20a 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -536,7 +536,7 @@
             <field name="descriptive_text">* The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
 Once the form had been filled, the employee send it to his supervisor.
 
-* It is the primary responsibility of the supervisor to gather the necessary input from     the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with Tiny Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
+* It is the primary responsibility of the supervisor to gather the necessary input from     the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
 
 * The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad hoc fields.
 
@@ -614,7 +614,7 @@ Once the form had been filled, the employee send it to his supervisor.
      * The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
 Once the form had been filled, the employee send it to his supervisor.
 
-     * It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with Tiny Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
+     * It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
 
      * The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad hoc fields.
 
@@ -1672,7 +1672,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="wait"/>
         </record>
     </data>
-    
+
 <!--    <data noupdate="1">-->
 <!--        <record id="hr_evaluation_interview_1" model="survey.request">-->
 <!--            <field name="state">waiting_answer</field>-->
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 32e93d5964b..a2ddebc5f20 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -200,7 +200,7 @@
             <field name="model">hr_evaluation.evaluation</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Evaluation">
+                <tree colors="blue:state in ('draft');black:state in ('wait','progress');gray:state in('done','cancel')" string="Evaluation">
                     <!--field name="create_date"/-->
                     <field name="employee_id"/>
                     <field name="plan_id"/>
@@ -238,7 +238,7 @@
                     <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
                         domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Overpassed"
-                            help="Evaluations that overpassed the deadline" domain="[('date','&gt;=',(datetime.date.today()))]" />
+                            help="Evaluations that overpassed the deadline" domain="[('date','&gt;=',str(datetime.date.today()))]" />
                         <separator orientation="vertical"/>
                         <field name="employee_id" />
                         <field name="plan_id" widget="selection" />
@@ -256,10 +256,12 @@
         </record>
 
         <record model="ir.actions.act_window" id="open_view_hr_evaluation_tree">
+            <field name="name">Evaluation</field>
             <field name="res_model">hr_evaluation.evaluation</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="hr_evaluation.evaluation_search"/>
+            <field name="help">Each employee can be assigned to an evaluation plan. These plans define the frequency and the way you manage your periodic personnal evalautions. You will be able to define steps and attach interview forms to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self evaluation and final evaluation by the manager.</field>
         </record>
 
         <menuitem name="Evaluation" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
@@ -339,12 +341,14 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_hr_evaluation_interview_tree">
+            <field name="name">Interview Requests</field>
             <field name="res_model">hr.evaluation.interview</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('is_evaluation' ,'=', True)]</field>
             <field name="context">{"search_default_todo":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
+            <field name="help">Interview Requests are generated automatically by OpenERP according to employees evaluation plan. Each user receives automatic emails and requests to perform evaluation of their collegues periodically.</field>
         </record>
 
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
index 87a362033f9..94e7c6dc701 100644
--- a/addons/hr_evaluation/i18n/es.po
+++ b/addons/hr_evaluation/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-25 12:18+0000\n"
-"PO-Revision-Date: 2010-06-29 22:34+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
+"PO-Revision-Date: 2010-07-23 19:03+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-07-01 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-07-24 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
@@ -84,7 +85,7 @@ msgstr "Datos informales"
 #. module: hr_evaluation
 #: 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."
+msgstr "Nombre de modelo no válido en la definición de la acción."
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,employee_id:0
diff --git a/addons/hr_evaluation/i18n/nl.po b/addons/hr_evaluation/i18n/nl.po
new file mode 100644
index 00000000000..9ddc92e753c
--- /dev/null
+++ b/addons/hr_evaluation/i18n/nl.po
@@ -0,0 +1,277 @@
+# Dutch 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: 2009-11-25 12:18+0000\n"
+"PO-Revision-Date: 2010-07-19 10:47+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-07-21 03:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,info:0
+msgid "Information"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Schedule next evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_bad:0
+msgid "Bad Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,value_ids:0
+msgid "Values"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_good:0
+msgid "Good Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,score:0
+#: field:hr_evaluation.quote,score:0
+#: field:hr_evaluation.type,score:0
+#: field:hr_evaluation.type.value,score:0
+msgid "Score"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Informal Data"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_improve:0
+msgid "To Improve"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,evaluation_id:0
+msgid "Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type.value,type_id:0
+msgid "Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Apply to categories"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "Ability to create employees evaluation."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,name:0
+msgid "Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,category_ids:0
+msgid "Appliable Role"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,user_id:0
+msgid "Evaluation User"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Choices Results"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
+msgid "Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
+msgid "Configuration"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
+msgid "Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
+msgid "Evaluation Criterions"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
+msgid "My Preceeding Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
+msgid "HR Responsible"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,value_id:0
+#: field:hr_evaluation.type.value,name:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
+msgid "Employee Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Quotations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
+msgid "Next Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,type_id:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,name:0
+msgid "Evaluation Criterion"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.quote:0
+msgid "Evalution Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,quote_ids:0
+msgid "Quotes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
+msgid "Employee Evaluation Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_employee:0
+msgid "Employee Response"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
+msgid "Evaluation Type Value"
+msgstr ""
diff --git a/addons/hr_evaluation/i18n/zh_CN.po b/addons/hr_evaluation/i18n/zh_CN.po
index 367319f26a6..dcf233599d0 100644
--- a/addons/hr_evaluation/i18n/zh_CN.po
+++ b/addons/hr_evaluation/i18n/zh_CN.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-25 12:18+0000\n"
-"PO-Revision-Date: 2010-05-15 06:32+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-07-20 10:41+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-06-22 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.type:0
 #: field:hr_evaluation.type,info:0
 msgid "Information"
-msgstr ""
+msgstr "信息"
 
 #. module: hr_evaluation
 #: constraint:ir.model:0
@@ -32,34 +32,34 @@ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Schedule next evaluation"
-msgstr "安排下次考核"
+msgstr "安排下一考核"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,info_bad:0
 msgid "Bad Points"
-msgstr ""
+msgstr "缺点"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
 msgid "My Next Evaluation"
-msgstr "我的下次考核"
+msgstr "我的下一考核"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.type,value_ids:0
 msgid "Values"
-msgstr ""
+msgstr "值"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,info_good:0
 msgid "Good Points"
-msgstr ""
+msgstr "优点"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,score:0
@@ -77,12 +77,12 @@ msgstr "草稿"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Informal Data"
-msgstr ""
+msgstr "信息数据"
 
 #. module: hr_evaluation
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,employee_id:0
@@ -93,185 +93,185 @@ msgstr "员工"
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,info_improve:0
 msgid "To Improve"
-msgstr ""
+msgstr "变好"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.quote,evaluation_id:0
 msgid "Evaluation"
-msgstr ""
+msgstr "考核"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.type.value,type_id:0
 msgid "Evaluation Type"
-msgstr ""
+msgstr "考核类型"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.type:0
 msgid "Apply to categories"
-msgstr ""
+msgstr "适用的分类"
 
 #. module: hr_evaluation
 #: model:ir.module.module,description:hr_evaluation.module_meta_information
 msgid "Ability to create employees evaluation."
-msgstr ""
+msgstr "建立员工能力考核"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.quote,name:0
 msgid "Quote"
-msgstr ""
+msgstr "引用"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.type,category_ids:0
 msgid "Appliable Role"
-msgstr ""
+msgstr "可申请的角色"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,user_id:0
 msgid "Evaluation User"
-msgstr ""
+msgstr "用户考核"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.type:0
 msgid "Choices Results"
-msgstr ""
+msgstr "选择结果"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
 msgid "Evaluations"
-msgstr ""
+msgstr "考核"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
 msgid "Configuration"
-msgstr ""
+msgstr "设置"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
 msgid "Next Evaluations"
-msgstr ""
+msgstr "下一考核"
 
 #. module: hr_evaluation
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件!"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
 msgid "Evaluation Criterions"
-msgstr ""
+msgstr "考核标准"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
 msgid "My Preceeding Evaluations"
-msgstr ""
+msgstr "我准备的考核"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
 msgid "HR Responsible"
-msgstr ""
+msgstr "人力资源责任"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.quote,value_id:0
 #: field:hr_evaluation.type.value,name:0
 msgid "Value"
-msgstr ""
+msgstr "值"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,name:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "有效"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.type:0
 msgid "Notes"
-msgstr ""
+msgstr "备注"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
 msgid "Employee Evaluation"
-msgstr ""
+msgstr "员工考核"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
 msgid "Employee Evaluation Type"
-msgstr ""
+msgstr "员工考核类型"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Quotations"
-msgstr ""
+msgstr "引用"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
 msgid "Next Employee Evaluation"
-msgstr ""
+msgstr "下一员工考核"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.quote,type_id:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.type:0
 #: field:hr_evaluation.type,name:0
 msgid "Evaluation Criterion"
-msgstr ""
+msgstr "考核标准"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
 msgid "My Next Evaluations"
-msgstr ""
+msgstr "我的下一考核"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.quote:0
 msgid "Evalution Quote"
-msgstr ""
+msgstr "考核引用"
 
 #. module: hr_evaluation
 #: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
 msgid "Human Resources Evaluation"
-msgstr ""
+msgstr "人力资源考核"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,quote_ids:0
 msgid "Quotes"
-msgstr ""
+msgstr "引号"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
 msgid "Employee Evaluation Quote"
-msgstr ""
+msgstr "员工考核引用"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,info_employee:0
 msgid "Employee Response"
-msgstr ""
+msgstr "员工回答"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
 msgid "Evaluation Type Value"
-msgstr ""
+msgstr "考核类型值"
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index a0f46170518..b4ab2743c0b 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -7,7 +7,8 @@
         <field name="model">hr.evaluation.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Evaluations Analysis">
+            <tree colors="blue:state in ('draft');black:state in ('wait','progress');gray:state in('done','cancel')"
+             string="Evaluations Analysis">
                 <field name="create_date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
                 <field name="deadline" invisible="1"/>
@@ -73,7 +74,7 @@
                     <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
-				<group expand="0" string="Extended options..." groups="base.group_extended">
+				<group expand="0" string="Extended Filters..." groups="base.group_extended">
                 <field name="rating"/>
                 <separator orientation="vertical"/>
                 <field name="deadline"/>
diff --git a/addons/hr_evaluation/test/test_hr_evaluation.yml b/addons/hr_evaluation/test/test_hr_evaluation.yml
index 6e9b11df3bc..cdee65dde26 100644
--- a/addons/hr_evaluation/test/test_hr_evaluation.yml
+++ b/addons/hr_evaluation/test/test_hr_evaluation.yml
@@ -1,16 +1,14 @@
-- |
+-
   In order to test hr_evaluation module for OpenERP, I will create plan then create evaluation under that plan.
 -
-  |
-  Given that I have "R & D" Department for employee.
-- 
+
+  I create new Department.
+-
   !record {model: hr.department, id: hr_department_rd0}:
     manager_id: base.user_root
-    name: 'R & D '
--     
-  |
-  Given that I have Employee “Mark Johnson” which take Interview.
-  select "R & D"  Department.    
+    name: 'R & D'
+-
+  I create a new employee.
 -
   !record {model: hr.employee, id: hr_employee_employee0}:
     address_home_id: base.res_partner_address_1
@@ -20,32 +18,31 @@
     name: Mark Johnson
     user_id: base.user_root
     department_id: 'hr_department_rd0'
-- |
-  I  create new employee “Phil Graves ” and select "Mark Johnson" as 
-  Manager.    
-- 
+-
+  I create another new employee and assign first one as it's Manager.
+-
   !record {model: hr.employee, id: hr_employee_employee1}:
     address_home_id: base.res_partner_address_3000
     company_id: base.main_company
     gender: male
-    name: Phil Graves 
+    name: Phil Graves
     user_id: base.user_demo
     parent_id: 'hr_employee_employee0'
 
-- | 
-  I Create "Employee Evaluation" survey for Manager's Evaluation Plan.
+-
+  I Create an "Employee Evaluation" survey for Manager's Evaluation Plan.
 -
     !record {model: 'survey', id: survey_0}:
         title: 'Employee Evaluation'
         max_response_limit: 20
         response_user: 2
-- |
-  I Create "Employee Evaluation" page in "Employee Evaluation" survey.
+-
+  I Create an "Employee Evaluation" page in "Employee Evaluation" survey.
 -
     !record {model: 'survey.page', id: survey_employee_page_0}:
         title: 'Employee Evaluation'
         survey_id: survey_0
-- |
+-
   I Create "What is your Name" question in "Employee Evaluation" survey page.
 -
     !record {model: 'survey.question', id: survey_p_question_0}:
@@ -53,7 +50,7 @@
         type: 'single_textbox'
         sequence: 1
         page_id: survey_employee_page_0
-- |
+-
   I Create "What is your gender" Question in "Employee Evaluation" survey page.
 -
     !record {model: 'survey.question', id: survey_p_question_1}:
@@ -62,30 +59,30 @@
         sequence: 2
         is_require_answer: true
         page_id: survey_employee_page_0
-- |
+-
   I Create "Male" answer in question "What is your gender?"
 -
     !record {model: 'survey.answer', id: survey_p_1_1}:
         answer: 'Male'
         sequence: 1
         question_id : survey_p_question_1
-- |
+-
   I Create "Female" answer in question "What is your gender?"
 -
     !record {model: 'survey.answer', id: survey_p_1_2}:
         answer: 'Female'
         sequence: 2
         question_id : survey_p_question_1
-        
-- |
-  Now Survey set in open state.
+
+-
+  I set the survey in open state.
 -
   !python {model: survey}: |
        self.survey_open(cr, uid, [ref("survey_0")], context)
 
-- |
-  I creating a Evaluation plan and select "Employee Evaluation" survey for "Send to Subordinates" and "Final interview with Manager" Phase. 
-- 
+-
+  I create an Evaluation plan and select "Employee Evaluation" survey for "Send to Subordinates" and "Final interview with Manager" Phase.
+-
   !record {model: hr_evaluation.plan, id: hr_evaluation_plan_managersplan0}:
     company_id: base.main_company
     month_first: 3
@@ -99,54 +96,52 @@
         name: Final Interview with manager
         sequence: 2
         survey_id: 'survey_0'
-        
-- |
-  Now I create Evaluation for "Phil Graves" Employee under "Manager Evaluation Plan".
-- 
+
+-
+  I create an Evaluation for employee under "Manager Evaluation Plan".
+-
   !record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
     date: '2010-06-28'
     employee_id: 'hr_employee_employee1'
     plan_id: 'hr_evaluation_plan_managersplan0'
     progress: 0.0
     state: draft
-- |
-  I check that Evaluation is in "Draft" state.
+-
+  I check that evaluation is in "Draft" state.
 -
   !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
-     - state == 'draft'      
-- |
-  I start Evaluation process by click on "Start Evaluation" button.
+     - state == 'draft'
+-
+  I start the evaluation process by click on "Start Evaluation" button.
 -
   !python {model: hr_evaluation.evaluation}: |
-     self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])   
+     self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
 
-- |
-  After that Manager Evaluation plan is In Progress. 
-  I close this servey request by giving answer of survey question. 
+-
+  I close this servey request by giving answer of survey question.
 -
   !python {model: hr.evaluation.interview}: |
       self.survey_req_done(cr, uid, [ref('hr_evaluation_evaluation_0')])
-- |
-  I click on "Final Validation" button to finalize Evaluation.
-- 
+-
+  I click on "Final Validation" button to finalise evaluation.
+-
   !python {model: hr_evaluation.evaluation}: |
     self.button_final_validation(cr, uid, [ref("hr_evaluation.hr_evaluation_evaluation_0")],
       {"active_ids": [ref("hr_evaluation.menu_open_view_hr_evaluation_tree")]})
-      
-- |
+
+-
   I check that state is "Final Validation".
 -
-  !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}: 
-      - state == 'progress'  
-- |
+  !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
+      - state == 'progress'
+-
   Give Rating "Meet expectations" by selecting overall Rating.
-- 
+-
   !record {model: hr_evaluation.evaluation, id: hr_evaluation.hr_evaluation_evaluation_0}:
     rating: '2'
-      
-- |
+
+-
   I close this Evaluation by click on "Done" button of this wizard.
-- 
+-
   !python {model: hr_evaluation.evaluation}: |
     self.button_done(cr, uid, [ref("hr_evaluation.hr_evaluation_evaluation_0")], {"active_ids": [ref("hr_evaluation.menu_open_view_hr_evaluation_tree")]})
- 
\ No newline at end of file
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
index 97dd1ca01c7..75aecf6a9f1 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail.py
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
@@ -30,6 +30,8 @@ class hr_evaluation_reminder(osv.osv_memory):
 
     def send_mail(self, cr, uid, ids, context=None):
         hr_evaluation_obj = self.pool.get('hr_evaluation.evaluation')
+        if context is None:
+            context = {}
         evaluation_data = self.read(cr, uid, ids, context=context)[0]
         for waiting_id in hr_evaluation_obj.browse(cr, uid, evaluation_data['evaluation_id'], context=context).survey_request_ids:
             if waiting_id.state == "waiting_answer" and waiting_id.user_to_review_id.work_email :
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 3be26d8ff72..109e658d433 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -38,7 +38,7 @@
     the invoice on timesheet module so that you will be able to automatically
     re-invoice your customer's expenses if your work by project.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['hr', 'account'],
     'init_xml': [],
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index d1d151c08f3..98eb7b9dc52 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -25,7 +25,9 @@ from osv import fields, osv
 from tools.translate import _
 
 def _employee_get(obj, cr, uid, context=None):
-    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
+    if context is None:
+        context = {}
+    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
     if ids:
         return ids[0]
     return False
@@ -33,21 +35,27 @@ def _employee_get(obj, cr, uid, context=None):
 class hr_expense_expense(osv.osv):
 
     def copy(self, cr, uid, id, default=None, context=None):
+        if context is None:
+            context = {}
         if not default: default = {}
         default.update({'invoice_id': False, 'date_confirm': False, 'date_valid': False, 'user_valid': False})
-        return super(hr_expense_expense, self).copy(cr, uid, id, default, context)
+        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):
-        user = self.pool.get('res.users').browse(cr, uid, [uid])[0]
+        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
         else:
-            return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
+            return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)], context=context)[0]
 
     _name = "hr.expense.expense"
     _description = "Expense"
@@ -115,6 +123,8 @@ class hr_expense_expense(osv.osv):
     def action_invoice_create(self, cr, uid, ids):
         res = False
         invoice_obj = self.pool.get('account.invoice')
+        property_obj = self.pool.get('ir.property')
+        sequence_obj = self.pool.get('ir.sequence')
         for exp in self.browse(cr, uid, ids):
             lines = []
             for l in exp.line_ids:
@@ -125,7 +135,7 @@ class hr_expense_expense(osv.osv):
                         acc = l.product_id.categ_id.property_account_expense_categ
                     tax_id = [x.id for x in l.product_id.supplier_taxes_id]
                 else:
-                    acc = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
+                    acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category')
                     if not acc:
                         raise osv.except_osv(_('Error !'), _('Please configure Default Expanse account for Product purchase, `property_account_expense_categ`'))
 
@@ -145,7 +155,7 @@ class hr_expense_expense(osv.osv):
             payment_term_id = exp.employee_id.address_id.partner_id.property_payment_term.id
             inv = {
                 'name': exp.name,
-                'reference': self.pool.get('ir.sequence').get(cr, uid, 'hr.expense.invoice'),
+                'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
                 'account_id': acc,
                 'type': 'in_invoice',
                 'partner_id': exp.employee_id.address_id.partner_id.id,
@@ -184,6 +194,8 @@ 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 len(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),))
@@ -215,16 +227,16 @@ class hr_expense_line(osv.osv):
             context = {}
         v = {}
         if product_id:
-            product=self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            v['name']=product.name
+            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            v['name'] = product.name
             # Compute based on pricetype of employee company
-            pricetype_id = self.pool.get('hr.employee').browse(cr, uid, employee_id).user_id.company_id.property_valuation_price_type.id
-            context['currency_id']=self.pool.get('hr.employee').browse(cr, uid, employee_id).user_id.company_id.currency_id.id
-            pricetype=self.pool.get('product.price.type').browse(cr, uid, pricetype_id)
-            amount_unit=product.price_get(pricetype.field, context)[product.id]
-            v['unit_amount']=amount_unit
+            pricetype_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).user_id.company_id.property_valuation_price_type.id
+            context['currency_id'] = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).user_id.company_id.currency_id.id
+            pricetype = self.pool.get('product.price.type').browse(cr, uid, pricetype_id, context=context)
+            amount_unit = product.price_get(pricetype.field, context)[product.id]
+            v['unit_amount'] = amount_unit
             if not uom_id:
-                v['uom_id']=product.uom_id.id
+                v['uom_id'] = product.uom_id.id
         return {'value': v}
 
 hr_expense_line()
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 6b92e792ad5..0e4a1c34095 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -45,7 +45,7 @@
             <field name="model">hr.expense.expense</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Expenses" editable="top">
+                <tree colors="blue:state in ('draft');black:state in ('confirm','accepted','invoiced','paid');gray:state in('cancelled')"  string="Expenses" editable="top">
                     <field name="date"/>
                     <field name="employee_id"/>
                     <field name="department_id" groups="base.group_extended"/>
@@ -128,7 +128,7 @@
                     <group>
                       <filter icon="terp-document-new" domain="[('state','=','draft')]" string="Draft" help="Draft Expense"/>
                       <separator orientation="vertical"/>
-                      <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Validate"
+                      <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Approve"
                         help="Confirmed Expense"/>
                       <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','accepted')]" string="To Pay"
                         help="Expenses to Invoice"/>
@@ -158,6 +158,7 @@
             <field name="view_type">form</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
+            <field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
         </record>
 
         <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root"/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 0152a09c240..71187ef0726 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -7,7 +7,7 @@
         <field name="model">hr.expense.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Expenses Analysis">
+            <tree colors="blue:state in ('draft');black:state in ('confirm','accepted','invoiced','paid');gray:state in('cancelled')" string="Expenses Analysis">
                 <field name="date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
                 <field name="year" invisible="1"/>
diff --git a/addons/hr_expense/test/test_hr_expense.yml b/addons/hr_expense/test/test_hr_expense.yml
index 70e2bfb874d..5fa0175eba1 100644
--- a/addons/hr_expense/test/test_hr_expense.yml
+++ b/addons/hr_expense/test/test_hr_expense.yml
@@ -1,27 +1,27 @@
-- |
-  In order to test hr_expenses for OpenERP, I create expense for employee and manage employee's expenses.
-- |
-  Creating  unit of measure category "Working Time".
+-
+  In order to test hr_expenses for OpenERP, I create expenses for employee and manage employee's expenses.
+-
+  I create an unit of measure category "Working Time".
 -
   !record {model: product.uom.categ, id: product_uom_categ_workingtime0}:
     name: Working Time.
 
-- |
-  Given that I have employee "Marc John" and his address.
+-
+  I create a new employee.
 -
   !record {model: hr.employee, id: hr.employee1}:
     address_home_id: base.res_partner_address_1
     address_id: base.main_address
-- |
-  I create  product unit of measure "Hour".
+-
+  I create product unit of measure "Hour".
 -
   !record {model: product.uom, id: product_uom_hour0}:
     category_id: 'product_uom_categ_workingtime0'
     factor: 8.0
     name: Hour
     rounding: 0.01
-- |
-  Creating a product  "travel" and select uom "Hour" and category "Working Time".
+-
+   I Create a product "travel".
 -
   !record {model: product.product, id: product_product_travel0}:
     categ_id: product.product_category_services
@@ -41,8 +41,8 @@
     weight: 0.0
     weight_net: 0.0
 
-- |
-  Now I create Expense "September Expenses" for  Marc John.And select product "travel".
+-
+  I create an expense.
 -
   !record {model: hr.expense.expense, id: hr_expense_expense_september0}:
     company_id: base.main_company
@@ -58,38 +58,38 @@
         uom_id: product.product_uom_unit
         unit_amount: 700.0
     user_id: base.user_root
-- |
-  I check that expenses on "draft" state.
+-
+  I check that expense is in "Draft" state.
 -
   !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
     - state == 'draft'
-- |
+-
   I confirm this expenses by click on "Confirm" button.
 -
   !workflow {model: hr.expense.expense, action: confirm, ref: hr_expense_expense_september0}
 
-- |
+-
   I check that state is "Waiting Confirmation".
 -
   !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
     - state == 'confirm'
-- |
+-
   I accept this expense by click on "Accept" button.
 -
   !workflow {model: hr.expense.expense, action: validate, ref: hr_expense_expense_september0}
 
-- |
+-
   I invoiced this expenses by click on "Invoice" button.
 -
   !workflow {model: hr.expense.expense, action: invoice, ref: hr_expense_expense_september0}
 
-- |
+-
   I check that state is "Invoiced"
 -
   !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
     - state == 'invoiced'
-- |
-  Now I check that Invoice is created for that expenses.
+-
+  I check that Invoice is created for the expense.
 -
   !python {model: hr.expense.expense}: |
     exp = self.browse(cr, uid, [ref('hr_expense_expense_september0')])[0]
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index e322a2d8786..e093526ad34 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name": "Human Resources: Holidays management",
     "version": "1.5",
-    "author": "Tiny & Axelor",
+    "author": "OpenERP SA & Axelor",
     "category": "Generic Modules/Human Resources",
     "website": "http://www.openerp.com",
     "description": """Human Ressources: Holidays tracking and workflow
@@ -48,7 +48,7 @@
             for example, you maybe will do it for the user 'admin'
             .
 """,
-    'author': 'Tiny & Axelor',
+    'author': 'OpenERP SA & Axelor',
     'website': 'http://www.openerp.com',
     'depends': ['hr', 'crm', 'process', 'resource'],
     'init_xml': [],
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index a5ffdbdfc49..4c27c2f7767 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -33,8 +33,10 @@ 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 = {}
         res = {}
-        for record in self.browse(cr, uid, ids, context):
+        for record in self.browse(cr, uid, ids, context=context):
             res[record.id] = {}
             max_leaves = leaves_taken = 0
             if not return_false:
@@ -50,6 +52,8 @@ 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 = {}
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             res[record.id] = {}
@@ -67,16 +71,18 @@ 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 = {}
-        
+
         if context and context.has_key('employee_id'):
             if not context['employee_id']:
                 return_false = True
             employee_id = context['employee_id']
         else:
-            employee_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)])
+            employee_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
             if employee_ids:
                 employee_id = employee_ids[0]
             else:
@@ -84,7 +90,7 @@ class hr_holidays_status(osv.osv):
         if employee_id:
             res = self.get_days(cr, uid, ids, employee_id, return_false, context=context)
         else:
-            res = dict.fromkeys(ids, {name: 0})
+            res = dict.fromkeys(ids, {'leaves_taken': 0, 'remaining_leaves': 0, 'max_leaves': 0})
         return res
 
     # To do: we can add remaining_leaves_category field to display remaining leaves for particular type
@@ -92,7 +98,7 @@ class hr_holidays_status(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Category', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example.'),
         'color_name': fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
-        'limit': fields.boolean('Allow to Override Limit', help='If you thick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
+        'limit': fields.boolean('Allow to Override Limit', help='If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
         'max_leaves': fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
         'leaves_taken': fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
@@ -112,7 +118,9 @@ class hr_holidays(osv.osv):
     _order = "type desc, date_from asc"
 
     def _employee_get(obj, cr, uid, context=None):
-        ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
+        if context is None:
+            context = {}
+        ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
         if ids:
             return ids[0]
         return False
@@ -152,13 +160,17 @@ 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)
+        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')
-        leave_ids = obj_res_leave.search(cr, uid, [('holiday_id', 'in', ids)])
+        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)
 
     def create(self, cr, uid, vals, context=None):
@@ -231,6 +243,8 @@ class hr_holidays(osv.osv):
     _constraints = [(_check_date, 'Start date should not be larger than end date!\nNumber of Days should be greater than 1!', ['number_of_days_temp'])]
 
     def unlink(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         self._update_user_holidays(cr, uid, ids)
         self._remove_resouce_leave(cr, uid, ids, context=context)
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
@@ -252,9 +266,11 @@ 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])[0]
+            brows_obj = self.pool.get('hr.holidays.status').browse(cr, uid, [status], context=context)[0]
             if brows_obj.categ_id and brows_obj.categ_id.section_id and not brows_obj.categ_id.section_id.allow_unlink:
                 warning = {
                     'title': "Warning for ",
@@ -369,6 +385,9 @@ class hr_holidays(osv.osv):
         return True
 
     def check_holidays(self, cr, uid, ids):
+        holi_status_obj = self.pool.get('hr.holidays.status')
+        emp_obj = self.pool.get('hr.employee')
+        meeting_obj = self.pool.get('crm.meeting')
         for record in self.browse(cr, uid, ids):
             if not record.number_of_days:
                 raise osv.except_osv(_('Warning!'), _('Wrong leave definition.'))
@@ -376,14 +395,14 @@ class hr_holidays(osv.osv):
                 leave_asked = record.number_of_days
                 if leave_asked < 0.00:
                     if not record.holiday_status_id.limit:
-                        leaves_rest = self.pool.get('hr.holidays.status').get_days(cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
+                        leaves_rest = holi_status_obj.get_days(cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
                         if leaves_rest < -(leave_asked):
                             raise osv.except_osv(_('Warning!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.'))
             elif record.holiday_type == 'category' and record.category_id:
                 leave_asked = record.number_of_days
                 if leave_asked < 0.00:
                     if not record.holiday_status_id.limit:
-                        leaves_rest = self.pool.get('hr.holidays.status').get_days_cat(cr, uid, [record.holiday_status_id.id], record.category_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
+                        leaves_rest = holi_status_obj.get_days_cat(cr, uid, [record.holiday_status_id.id], record.category_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
                         if leaves_rest < -(leave_asked):
                             raise osv.except_osv(_('Warning!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.'))
             else:# This condition will never meet!!
@@ -401,10 +420,10 @@ class hr_holidays(osv.osv):
                     'allocation_type': record.allocation_type,
                     'parent_id': record.id,
                 }
-                employee_ids = self.pool.get('hr.employee').search(cr, uid, [])
+                employee_ids = emp_obj.search(cr, uid, [])
                 for employee in employee_ids:
                     vals['employee_id'] = employee
-                    user_id = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)])
+                    user_id = emp_obj.search(cr, uid, [('user_id','=',uid)])
                     if user_id:
                         vals['user_id'] = user_id[0]
                     holiday_ids.append(self.create(cr, uid, vals, context=None))
@@ -435,7 +454,7 @@ class hr_holidays(osv.osv):
                     'user_id' : record.user_id.id,
                     'date' : record.date_from,
                 }
-                case_id = self.pool.get('crm.meeting').create(cr, uid, vals)
+                case_id = meeting_obj.create(cr, uid, vals)
                 self.write(cr, uid, ids, {'case_id': case_id})
 
         return True
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index bd96de3dd82..61649cb0c47 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -10,7 +10,7 @@
                 <search string="Search Leave">
                     <group col='8' colspan='4'>
                         <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','draft')]" string="To Confirm"/>
-                        <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Validate"/>
+                        <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Approve"/>
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"
                             default="context.get('report', False)"/>
                         <separator orientation="vertical"/>
@@ -69,8 +69,8 @@
                             <field name="state" colspan="2"/>
                             <group colspan="2">
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                                <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-                                <button string="Approve" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
+                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
+                                <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
                                 <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
                                 <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
                                 <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
@@ -113,8 +113,8 @@
                         <field name="state" colspan="2"/>
                         <group colspan="2">
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                            <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-                            <button string="Approve" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
+                            <button string="To Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
+                            <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
                             <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
                             <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
                             <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
@@ -130,7 +130,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Leaves" colors="red:state == 'refuse';grey:state == 'cancel'">
+                <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1');gray:state in ('cancel') " string="Leaves" >
                     <field name="employee_id"/>
                     <field name="department_id"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
@@ -168,7 +168,7 @@
                             <field name="state" colspan="2"/>
                             <group colspan="2">
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                                <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
+                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
                                 <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no"/>
                                 <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel"/>
                                 <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
@@ -185,7 +185,7 @@
             <field name="type">tree</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <tree string="Leaves Summary">
+                <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1');gray:state in ('cancel')" string="Leaves Summary">
                     <field name="employee_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
@@ -206,7 +206,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Leaves" colors="red:state == 'refuse';grey:state == 'cancel'">
+                <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1');gray:state in ('cancel')">
                     <field name="employee_id"/>
                     <field name="department_id"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
@@ -253,6 +253,7 @@
             <field name="domain">[('type','=','remove')]</field>
             <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
+            <field name="help">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.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index 89567065a65..258f83b2875 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:28+0000\n"
+"PO-Revision-Date: 2010-07-20 13:20+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-06-22 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -24,17 +24,17 @@ msgstr "新的假期申请"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
 msgid "All Holidays Requests"
-msgstr "所有假期请求"
+msgstr "所有假期申请"
 
 #. module: hr_holidays
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr "剩余准假"
+msgstr "剩余休假"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting
@@ -106,7 +106,7 @@ msgstr "员工申请"
 #: selection:hr.holidays,state:0
 #: model:process.transition.action,name:hr_holidays.process_transition_action_validate0
 msgid "Validate"
-msgstr "批准"
+msgstr "确认"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_refusedrequest0
@@ -116,12 +116,12 @@ msgstr "拒绝申请"
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_approved0
 msgid "Approved"
-msgstr "批准"
+msgstr "已核准"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Both"
-msgstr "两个"
+msgstr "双方"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -165,7 +165,7 @@ msgstr "假期管理"
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "Analyze from"
-msgstr "来自分析"
+msgstr "从分析"
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
@@ -190,12 +190,12 @@ msgstr "假期状态"
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "Vacation end day"
-msgstr "批准结束日期"
+msgstr "假期结束日期"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "Holidays Allowed"
-msgstr "假期允许"
+msgstr "假期已批准"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_legaldeclaration0
@@ -205,7 +205,7 @@ msgstr "法定的新员工"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Magenta"
-msgstr "紫红色"
+msgstr "洋红色"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
@@ -221,7 +221,7 @@ msgstr "设定假期状态"
 #: selection:hr.holidays.summary,init,holiday_type:0
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Confirmed"
-msgstr "确认"
+msgstr "已确认"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,date_from:0
@@ -249,7 +249,7 @@ msgstr "员工_ID"
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysdefinition0
 msgid "Encoding of annual available holidays."
-msgstr "可得到的年度假期编号"
+msgstr "每年可得到的假期编码"
 
 #. module: hr_holidays
 #: field:hr.holidays,employee_id:0
@@ -310,22 +310,22 @@ msgstr "报表选项"
 #. module: hr_holidays
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_approved0
 msgid "His manager approves the request"
-msgstr "管理者批准这申请"
+msgstr "经理批准这申请"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0
 msgid "If holidays available, employee can take it and fill it."
-msgstr "如果有假期可用"
+msgstr "如果有假期, 员工能提取它"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary.employee,notify:0
 msgid "You have to select at least 1 Employee. Try again."
-msgstr "你必须至少选择1部门再试一次"
+msgstr "你必须至少选择一名员工, 再试一次"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate
@@ -352,7 +352,7 @@ msgstr "每个员工的假期"
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to override Limit"
-msgstr "允许覆盖的限制"
+msgstr "允许重叠的限制"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,holiday_user_id:0
@@ -377,12 +377,12 @@ msgstr "打印员工假期摘要"
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_calendar0
 msgid "Calendar"
-msgstr "日历"
+msgstr "日程表"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Vacation start day"
-msgstr "批准结束日期"
+msgstr "批准发生日期"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -422,22 +422,15 @@ msgid ""
 msgstr ""
 "人力资源:假期跟踪和工作流\n"
 "\n"
-"这模块允许你管理假期和假期请求每个员工能为每个可用假期的状态定义一个数字\n"
+"这模块允许你管理假期和假期申请. 每个员工能为每个可用假期的状态定义一个数字\n"
 "\n"
-"备注:\n"
-"同步内部日程(使用业务关系管理模块)它可以:接受自动创建一个假期申请,你要在事务节连接到假期状态.你能设置信息和偏好的颜色\n"
-"                人力资源 / 设置 / 假期状态\n"
-"    - 员工能请求负数的假期 (如假期为-2日), 它被转换为询问系统要求更多的休息日. 它将增加有效总假期 (如果申请批准).\n"
-"    - 有两种方法打印员工的假期:\n"
-"        * 允许按部门分员工，通过在菜单点击\n"
-"                人力资源 / 假期申请 / 打印假期摘要\n"
-"        * 允许你为指定的员工选择假期\n"
-"                人力资源 / 员工 / 所有员工\n"
-"            然后选择你想打印的内容后点击打印图标\n"
-"                '打印员工假期摘要'\n"
-"    - 这向导允许你选择打印确认或有效的假期'. \n"
-"                Administration / Users / Users\n"
-"            例如, 你可能是 'admin'.\n"
+"    备注:\n"
+"        - 同步内部日程(使用业务关系管理模块)它可以: 在接受假期申请时自动创建一个事务, 你要能把假期哦状态链接到划分的事务.\n"
+"          在人力资源/ 设置/ 假期状态, 你能设置信息和偏好的颜色.\n"
+"        - 员工能请求负数的假期 (如假期为-2日), 它被系统转换为要求更多的休息日. 它将延长假期 (如果申请批准).\n"
+"        - 有两种方法打印员工的假期:\n"
+"            * 第一种允许按部门的员工, 通过在菜单点击: 人力资源 / 假期申请 / 打印假期摘要\n"
+"            * 第二种允许你选择指定的员工的假期报表菜单点击为: 人力资源 / 员工.先选员工,  然后点击打印图标'打印员工假期摘要'\n"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
@@ -453,7 +446,7 @@ msgstr "员工填写假期申请"
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_setholiday0
 msgid "Holiday is set in the calendar."
-msgstr "在日历设定假期"
+msgstr "在日程表设定假期"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -469,12 +462,12 @@ msgstr "我可用的假期"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Black"
-msgstr "黑"
+msgstr "黑色"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
 msgid "My Refused Holidays Requests"
-msgstr "我拒接的假期申请"
+msgstr "我被拒绝的假期申请"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_setholiday0
@@ -489,7 +482,7 @@ msgstr "我的假期申请草稿"
 #. module: hr_holidays
 #: field:hr.holidays.per.user,max_leaves:0
 msgid "Maximum Leaves Allowed"
-msgstr "最大准假允许"
+msgstr "最大休假允许"
 
 #. module: hr_holidays
 #: field:hr.holidays,state:0
@@ -504,7 +497,7 @@ msgstr "象牙白"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
 msgid "My Holidays Request"
-msgstr "物品的假期申请"
+msgstr "我的假期申请"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -519,7 +512,7 @@ msgstr "批准和确认"
 #. module: hr_holidays
 #: field:hr.holidays.per.user,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr "准假已得到"
+msgstr "休假已得到"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -575,7 +568,7 @@ msgstr "我的假期申请草稿"
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
 msgid "Approved Request"
-msgstr "批准请求"
+msgstr "申请批准"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysrequest0
@@ -590,7 +583,7 @@ msgstr "假期申请等待批准"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "General"
-msgstr "普通"
+msgstr "通用"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
@@ -614,12 +607,12 @@ msgstr "假期申请定义"
 #: selection:hr.holidays.summary,init,holiday_type:0
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Validated"
-msgstr "批准"
+msgstr "确认"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
 msgid "My Holidays Request Refused"
-msgstr "我拒绝的假期申请"
+msgstr "我被拒绝的假期申请"
 
 #. module: hr_holidays
 #: constraint:ir.model:0
@@ -653,7 +646,7 @@ msgstr "说明"
 #: selection:hr.holidays,state:0
 #: model:process.node,name:hr_holidays.process_node_refused0
 msgid "Refused"
-msgstr "已拒绝"
+msgstr "被拒绝"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_approvedrequest0
@@ -674,7 +667,7 @@ msgstr "选择假期类型"
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 msgid "Case"
-msgstr "成本"
+msgstr "事务"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_user_id:0
@@ -684,17 +677,17 @@ msgstr "每个用户的假期"
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidays0
 msgid "Encode number of available holidays"
-msgstr "可得到的假期编号"
+msgstr "可得假期的编号"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_legaldeclaration0
 msgid "Secretariat Social"
-msgstr "社保"
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Violet"
-msgstr "紫色"
+msgstr "紫罗兰色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -714,7 +707,7 @@ msgstr "假期处理"
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
 msgid "You have to select at least 1 Department. Try again."
-msgstr "你必须至少选择1部门再试一次"
+msgstr "你必须至少选择一个部门, 再试一次"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate
@@ -739,7 +732,7 @@ msgstr "浅粉红色"
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_refused0
 msgid "His manager refuses the request"
-msgstr "管理者拒绝这申请"
+msgstr "经理拒绝这申请"
 
 #~ msgid "Action"
 #~ msgstr "行动"
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index a172e7eb0ea..205e8ce31ed 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -71,7 +71,7 @@
 	                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
 	                </group>
 	                <newline/>
-	                <group expand="0" string="Extended options..." colspan="10" col="12">
+	                <group expand="0" string="Extended Filters..." colspan="10" col="12">
                     <field name="holiday_status_id" widget="selection"/>
                 	<field name="department_id" widget="selection"/>
 	                </group>
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index a0fa2cdd131..5b14835349b 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -88,6 +88,8 @@ def emp_create_xml(self, cr, uid, dept, holiday_type, row_id, empid, name, som,
 
 class report_custom(report_rml):
     def create_xml(self, cr, uid, ids, data, context):
+        obj_dept = pooler.get_pool(cr.dbname).get('hr.department')
+        obj_emp = pooler.get_pool(cr.dbname).get('hr.employee')
         depts=[]
         emp_id={}
 #        done={}
@@ -211,31 +213,24 @@ class report_custom(report_rml):
 
         if data['model']=='hr.employee':
             for id in data['form']['emp']:
-                 items = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, id, ['id','name'])
+                 items = obj_emp.read(cr, uid, id, ['id','name'])
 
                  emp_xml += emp_create_xml(self, cr, uid, 0, holiday_type, row_id, items['id'], items['name'], som, eom)
                  row_id = row_id +1
 
         elif data['model']=='ir.ui.menu':
             for id in data['form']['depts']:
-                dept = pooler.get_pool(cr.dbname).get('hr.department').browse(cr, uid, id, context.copy())
-                depts.append(dept)
-                dept_ids = tuple(data['form']['depts'])
-
-                cr.execute("""select dept_user.user_id \
-                from hr_department_user_rel dept_user \
-                where dept_user.department_id = %s\
-                union\
-                select dept.manager_id from hr_department dept\
-                where dept.id = %s""", (id, id))
+                dept = obj_dept.browse(cr, uid, id, context=context)
 
+                cr.execute("""select dept.manager_id from hr_department dept\
+                where dept.id = %s""", (id,))
                 result=cr.fetchall()
                 if result==[]:
                     continue
                 dept_done=0
                 for d in range(0,len(result)):
-                    emp_id[d]=pooler.get_pool(cr.dbname).get('hr.employee').search(cr, uid, [('user_id', '=', result[d][0])])
-                    items = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, emp_id[d], ['id', 'name'])
+                    emp_id[d] = obj_emp.search(cr, uid, [('user_id', '=', result[d][0])])
+                    items = obj_emp.read(cr, uid, emp_id[d], ['id', 'name'])
                     for item in items:
 #                        if item['id'] in done:
 #                            continue
@@ -244,11 +239,9 @@ class report_custom(report_rml):
                             emp_xml += emp_create_xml(self, cr, uid, 1, holiday_type, row_id, dept.id, dept.name, som, eom)
                             row_id = row_id +1
                         dept_done=1
-
 #                        done[item['id']] = 1
                         emp_xml += emp_create_xml(self, cr, uid, 0, holiday_type, row_id, item['id'], item['name'], som, eom)
                         row_id = row_id +1
-
         # Computing the xml
         xml='''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index be08ab63bae..e25a7487e51 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -7,7 +7,7 @@
         <field name="model">hr.holidays.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leaves Statistics">
+            <tree colors="blue:state in ('draft');black:state in ('confirm','refuse','validate');gray:state in('cancel')" string="Leaves Statistics">
                 <field name="date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
                 <field name="category_id" invisible="1"/>
@@ -56,7 +56,7 @@
 	                	help = "Draft and Confirmed leaves"/>
 	               	<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
 	               		help = "Pending Leaves"/>
-                  <filter icon="terp-gtk-stop" string="Cancelled" domain="[('state','=','cancel')]"/>
+                  <filter icon="gtk-cancel" string="Cancelled" domain="[('state','=','cancel')]"/>
 					<separator orientation="vertical"/>
                     <field name="department_id"/>
 					<field name="employee_id"/>
@@ -80,7 +80,7 @@
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
+                <group expand="0" string="Extended Filters..." colspan="10" col="12">
                     <field name="holiday_status_id"/>
                     <field name="category_id"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index 68d58b1791b..03c1666dc6f 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -1,8 +1,8 @@
-- |
-  In order to test the hr_holiday in OpenERP, I will  Allocate leaves for Employee and manage leaves and leaves requests.
-- |
-  For that First I create new user "user1" to make leave request.
-- 
+-
+  In order to test the hr_holiday module in OpenERP, I will  Allocate leaves for Employee and manage leaves and leaves requests.
+-
+  I create new user "user1" to who makes leave request.
+-
   !record {model: res.users, id: res_users_user0}:
     company_id: base.main_company
     context_lang: en_US
@@ -13,7 +13,7 @@
     login: user1
     name: user1
     password: user1
-- |
+-
   I create a new employee “Mark Johnshon” as Manager to validate employee leave.
 -
   !record {model: hr.employee, id: hr_employee_employee0}:
@@ -22,90 +22,87 @@
     gender: male
     name: Mark Johnson
     user_id: base.user_root
-- |
-  Create another employee "Phil Graves" as "user1" who make leave request.
-- 
+-
+  I Create another employee "Phil Graves" as "user1".
+-
   !record {model: hr.employee, id: hr_employee_philgraves0}:
     address_home_id: base.res_partner_address_8
     name: Phil Graves
     parent_id: 'hr_employee_employee0'
     user_id: 'res_users_user0'
-- |
-  Given that I have  Leave type for employee.
-- 
-  !record {model: hr.holidays.status, id: hr_holidays_status_fullleave0}:
+-
+  I create a new Leave type "Sick Leave".
+-
+  !record {model: hr.holidays.status, id: hr_holidays_status_sick0}:
     color_name: red
-    name: Full Leave.
-    limit: 1
+    name: Sick Leave.
+    limit: 12
 
-- |
-  After that I allocate leave request for employee "Phil Graves".
-- 
+-
+  I allocate leave request for employee "Phil Graves".
+-
   !record {model: hr.holidays, id: hr_holidays_allocateleaveforuser0}:
     allocation_type: employee
     employee_id: 'hr_employee_philgraves0'
-    holiday_status_id: hr_holidays_status_fullleave0
-    name: Allocate leave for user1
+    holiday_status_id: hr_holidays_status_sick0
+    name: Sick Leaves for Phil Graves
     number_of_days_temp: 12.0
     date_from: '05/20/2010 13:59:00'
     date_to: '05/22/2010 13:59:00'
     type: add
-- | 
-  I click on "Confirm" button to confirm allocate leave for employee.
-- 
-  !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_allocateleaveforuser0}
-       
-- |
-  I click on "Validate" button to validate leave for employee.
 -
-  !workflow {model: hr.holidays, action: validate,  ref: hr_holidays_allocateleaveforuser0}  
+  I confirmed the allocation by clicking on "Confirm" button.
+-
+  !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_allocateleaveforuser0}
 
-- |
-  Now employee "Phil Graves" want to leave. so, I connect as user1 which is username of this employee and want to make leave request.     
-- 
+-
+  I validate the allocation by clicking on "To Approve" button.
+-
+  !workflow {model: hr.holidays, action: validate,  ref: hr_holidays_allocateleaveforuser0}
+
+-
+  I connect as "user1", and create a new leave request for employee "Phil Graves".
+-
   !record {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
     allocation_type: employee
     date_from: '2010-05-20 11:48:00'
     date_to: '2010-05-21 11:48:00'
     employee_id: 'hr_employee_philgraves0'
-    holiday_status_id: 'hr_holidays_status_fullleave0'
-    name: I want to leave for go to hospital
-    notes: I want to leave for go to hospital. so please accept my leave.
+    holiday_status_id: 'hr_holidays_status_sick0'
+    name: Appointment with Doctor
+    notes: My appointment with the doctor is confirmed. so please accept my leave.
     number_of_days_temp: 2.0
     type: remove
     user_id: 'res_users_user0'
-- |
-  I check that Leave Request is on "Draft" state.
+-
+  I check that Leave Request is in "Draft" state.
 -
   !assert {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
-    - state == 'draft'  
-       
-- |
-  I confirm my leave Request by click on "Confirm" button.
-- 
+    - state == 'draft'
+
+-
+  I confirm leave Request by click on "Confirm" button.
+-
   !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_iwanttoleaveforgotohospital0}
-  
-- |
-  I connect as Admin user and Open Leave request of "Phil Graves".
-  and "validate" it by click on "validate" button.
-- 
+
+-
+  I connect as "Admin" user and Open Leave request of "Phil Graves" and "validate" it by click on "Approve" button.
+-
   !workflow {model: hr.holidays, action: validate,  ref: hr_holidays_iwanttoleaveforgotohospital0}
-  
-- |
-  I check that "Leave Manager" field is automaticly filled by the user who validate the leave'.
+
+-
+  I check that "Leave Manager" field is automatically filled by the user who validate the leave'.
 -
   !python {model: hr.holidays}: |
      ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
      obj = self.browse(cr, uid, ref('hr_holidays_iwanttoleaveforgotohospital0'))
      assert ids2[0] == obj.manager_id.id
-  
-- | 
+
+-
   I check that Leave request state is "Validated".
-- 
+-
   !assert {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
-    - state == "validate" 
-  
-- |
-  I can also see Summary of Employee's holiday by using 'Print Summary of Employee's Holidays'.
-  This will allow you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. 
-               
\ No newline at end of file
+    - state == "validate"
+
+-
+  I can also see Summary of Employee's holiday by using 'Employee's Holidays' Report. This report will allows to choose to print holidays with state Confirmed, Validated or both.
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index af9c92d9f59..a08354fd40d 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -39,7 +39,9 @@ class hr_holidays_summary_dept(osv.osv_memory):
         }
 
     def print_report(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [])[0]
+        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'))
         datas = {
@@ -51,7 +53,6 @@ class hr_holidays_summary_dept(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'holidays.summary',
             'datas': datas,
-            'nodestroy': True,
             }
 
 hr_holidays_summary_dept()
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
index 8ca69ef9274..ca9ccc83db7 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -38,7 +38,9 @@ class hr_holidays_summary_employee(osv.osv_memory):
         }
 
     def print_report(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [])[0]
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [], context=context)[0]
         data['emp'] = context['active_ids']
         datas = {
              'ids': [],
diff --git a/addons/hr_payroll/__init__.py b/addons/hr_payroll/__init__.py
index ee49b4e7794..c66b5ab7948 100644
--- a/addons/hr_payroll/__init__.py
+++ b/addons/hr_payroll/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
@@ -25,4 +24,4 @@ import hr_payroll
 import report
 import wizard
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 3efa777885c..188a5e84197 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -33,7 +33,7 @@
     * Monthly Payroll Register
     * Integrated with Holiday Management
     """,
-    'author':'Tiny/Axelor',
+    'author':'OpenERP SA/Axelor',
     'website':'http://www.openerp.com',
     'depends': [
         'hr',
@@ -53,13 +53,11 @@
         'wizard/hr_payroll_create_analytic.xml',
         'wizard/hr_payroll_employees_detail.xml',
         'wizard/hr_payroll_year_salary.xml',
-
     ],
     'test': [
-             'test/payslip.yml',
-             'test/payment_advice.yml',
-             'test/payroll_register.yml',
- 
+         'test/payslip.yml',
+         'test/payment_advice.yml',
+         'test/payroll_register.yml',
     ],
     'demo_xml': [
         'hr_payroll_demo.xml'
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 753d3d6d017..a7984d7c7fa 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -21,15 +21,14 @@
 ##############################################################################
 
 import time
+from datetime import date, datetime, timedelta
 import netsvc
-from osv import osv
-from osv import fields
+
+from osv import fields, osv
 from tools import config
 from tools.translate import _
 
-from datetime import date
-from datetime import datetime
-from datetime import timedelta
+
 
 def prev_bounds(cdate=False):
     when = date.fromtimestamp(time.mktime(time.strptime(cdate,"%Y-%m-%d")))
@@ -114,12 +113,14 @@ class hr_payroll_structure(osv.osv):
 
         @return: returns a id of newly created record
         """
-        code = self.browse(cr, uid, id).code
+        if context is None:
+            context = {}
+        code = self.browse(cr, uid, id, context=context).code
         default = {
             'code':code+"(copy)",
             'company_id':self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         }
-        res_id = super(hr_payroll_structure, self).copy(cr, uid, id, default, context)
+        res_id = super(hr_payroll_structure, self).copy(cr, uid, id, default, context=context)
         return res_id
 
 hr_payroll_structure()
@@ -153,13 +154,13 @@ class payroll_register(osv.osv):
     _name = 'hr.payroll.register'
     _description = 'Payroll Register'
 
-    def _calculate(self, cr, uid, ids, field_names, arg, context):
+    def _calculate(self, cr, uid, ids, field_names, arg, context=None):
         res = {}
         allounce = 0.0
         deduction = 0.0
         net = 0.0
         grows = 0.0
-        for register in self.browse(cr, uid, ids, context):
+        for register in self.browse(cr, uid, ids, context=context):
             for slip in register.line_ids:
                 allounce += slip.allounce
                 deduction += slip.deduction
@@ -210,21 +211,23 @@ class payroll_register(osv.osv):
                     context=context).company_id.id,
     }
 
-    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")
+        if context is None:
+            context = {}
 
-        vals = self.browse(cr, uid, ids)[0]
+        vals = self.browse(cr, uid, ids, context=context)[0]
 
-        emp_ids = emp_pool.search(cr, uid, [])
+        emp_ids = emp_pool.search(cr, uid, [], context=context)
 
-        for emp in emp_pool.browse(cr, uid, emp_ids):
-            old_slips = slip_pool.search(cr, uid, [('employee_id','=', emp.id), ('date','=',vals.date)])
+        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)], context=context)
             if old_slips:
-                slip_pool.write(cr, uid, old_slips, {'register_id':ids[0]})
+                slip_pool.write(cr, uid, old_slips, {'register_id':ids[0]}, context=context)
                 for sid in old_slips:
                     wf_service.trg_validate(uid, 'hr.payslip', sid, 'compute_sheet', cr)
             else:
@@ -237,48 +240,54 @@ class payroll_register(osv.osv):
                     'journal_id':vals.journal_id.id,
                     'bank_journal_id':vals.bank_journal_id.id
                 }
-                slip_id = slip_pool.create(cr, uid, res)
+                slip_id = slip_pool.create(cr, uid, res, context=context)
                 wf_service.trg_validate(uid, 'hr.payslip', slip_id, 'compute_sheet', cr)
 
         number = self.pool.get('ir.sequence').get(cr, uid, 'salary.register')
-        self.write(cr, uid, ids, {'state':'draft', 'number':number})
+        self.write(cr, uid, ids, {'state':'draft', 'number':number}, context=context)
         return True
 
-    def verify_sheet(self, cr, uid, ids, context={}):
+    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:
-            sids = slip_pool.search(cr, uid, [('register_id','=',id)])
+            sids = slip_pool.search(cr, uid, [('register_id','=',id)], context=context)
             wf_service = netsvc.LocalService("workflow")
             for sid in sids:
                 wf_service.trg_validate(uid, 'hr.payslip', sid, 'verify_sheet', cr)
 
-        self.write(cr, uid, ids, {'state':'hr_check'})
+        self.write(cr, uid, ids, {'state':'hr_check'}, context=context)
         return True
 
-    def final_verify_sheet(self, cr, uid, ids, context={}):
+    def final_verify_sheet(self, cr, uid, ids, context=None):
         slip_pool = self.pool.get('hr.payslip')
         advice_pool = self.pool.get('hr.payroll.advice')
         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')])
+            sids = slip_pool.search(cr, uid, [('register_id','=',id), ('state','=','hr_check')], context=context)
             wf_service = netsvc.LocalService("workflow")
             for sid in sids:
                 wf_service.trg_validate(uid, 'hr.payslip', sid, 'final_verify_sheet', cr)
 
-        for reg in self.browse(cr, uid, ids):
+        for reg in self.browse(cr, uid, ids, context=context):
             accs = {}
             for slip in reg.line_ids:
                 pid = False
                 if accs.get(slip.employee_id.property_bank_account.code, False) == False:
                     advice = {
-                        'name': 'Payment Advice from %s / Bank Account %s' % (self.pool.get('res.users').browse(cr, uid, uid).company_id.name, slip.employee_id.property_bank_account.name),
-                        'number': self.pool.get('ir.sequence').get(cr, uid, 'payment.advice'),
+                        'name': 'Payment Advice from %s / Bank Account %s' % (users_pool.browse(cr, uid, uid, context=context).company_id.name, slip.employee_id.property_bank_account.name),
+                        'number': sequence_pool.get(cr, uid, 'payment.advice'),
                         'register_id':reg.id,
                         'account_id':slip.employee_id.property_bank_account.id
                     }
-                    pid = advice_pool.create(cr, uid, advice)
+                    pid = advice_pool.create(cr, uid, advice, context=context)
                     accs[slip.employee_id.property_bank_account.code] = pid
                 else:
                     pid = accs[slip.employee_id.property_bank_account.code]
@@ -290,21 +299,21 @@ class payroll_register(osv.osv):
                     'amount':slip.other_pay + slip.net,
                     'bysal':slip.net
                 }
-                id = advice_line_pool.create(cr, uid, pline)
+                id = advice_line_pool.create(cr, uid, pline, context=context)
 
         #, 'advice_ids':[(6, 0, [pid])]
-        self.write(cr, uid, ids, {'state':'confirm'})
+        self.write(cr, uid, ids, {'state':'confirm'}, context=context)
         return True
 
-    def process_sheet(self, cr, uid, ids, context={}):
+    def process_sheet(self, cr, uid, ids, context=None):
         slip_pool = self.pool.get('hr.payslip')
         for id in ids:
-            sids = slip_pool.search(cr, uid, [('register_id','=',id), ('state','=','confirm')])
+            sids = slip_pool.search(cr, uid, [('register_id','=',id), ('state','=','confirm')], context=context)
             wf_service = netsvc.LocalService("workflow")
             for sid in sids:
                 wf_service.trg_validate(uid, 'hr.payslip', sid, 'process_sheet', cr)
 
-        self.write(cr, uid, ids, {'state':'done'})
+        self.write(cr, uid, ids, {'state':'done'}, context=context)
         return True
 
 payroll_register()
@@ -341,16 +350,22 @@ class payroll_advice(osv.osv):
                     context=context).company_id.id,
     }
 
-    def confirm_sheet(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'confirm'})
+    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={}):
-        self.write(cr, uid, ids, {'state':'draft'})
+    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={}):
-        self.write(cr, uid, ids, {'state':'cancel'})
+    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
 
 payroll_advice()
@@ -374,15 +389,17 @@ class payroll_advice_line(osv.osv):
         'flag': lambda *a: 'C',
     }
 
-    def onchange_employee_id(self, cr, uid, ids, ddate, employee_id, context={}):
+    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
-            sids = slip_pool.search(cr, uid, [('paid','=',False),('state','=','confirm'),('date','>=',dates[0]), ('employee_id','=',employee_id), ('date','<=',dates[1])])
+            sids = slip_pool.search(cr, uid, [('paid','=',False),('state','=','confirm'),('date','>=',dates[0]), ('employee_id','=',employee_id), ('date','<=',dates[1])], context=context)
             if sids:
-                slip = slip_pool.browse(cr, uid, sids[0])
+                slip = slip_pool.browse(cr, uid, sids[0], context=context)
                 vals['name'] = slip.employee_id.otherid
                 vals['amount'] = slip.net + slip.other_pay
                 vals['bysal'] = slip.net
@@ -398,24 +415,26 @@ 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')
-        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
+        if context is None:
+            context = {}
+        period_id = self.pool.get('account.period').search(cr,uid,[('date_start','<=',time.strftime('%Y-%m-%d')),('date_stop','>=',time.strftime('%Y-%m-%d'))], context=context)[0]
+        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):
-            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)])
+        for cur in self.browse(cr, uid, ids, context=context):
+            current = line_pool.search(cr, uid, [('period_id','=',period_id),('register_id','=',cur.id)], context=context)
+            years = line_pool.search(cr, uid, [('period_id.fiscalyear_id','=',fiscalyear_id.id), ('register_id','=',cur.id)], context=context)
 
             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
 
@@ -454,9 +473,11 @@ class contrib_register_line(osv.osv):
     _name = 'hr.contibution.register.line'
     _description = 'Contribution Register Line'
 
-    def _total(self, cr, uid, ids, field_names, arg, context):
+    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):
+        for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = line.emp_deduction + line.comp_deduction
             return res
 
@@ -564,22 +585,23 @@ class company_contribution(osv.osv):
                     context=context).company_id.id,
     }
 
-    def execute_function(self, cr, uid, id, value, context):
+    def execute_function(self, cr, uid, id, value, context=None):
         """
         self: pointer to self object
         cr: cursor to database
         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)])
+        ids = line_pool.search(cr, uid, [('category_id','=',id), ('to_val','>=',value),('from_val','<=',value)], context=context)
         if not ids:
-            ids = line_pool.search(cr, uid, [('category_id','=',id), ('from','<=',value)])
+            ids = line_pool.search(cr, uid, [('category_id','=',id), ('from','<=',value)], context=context)
         if not ids:
             res = 0
         else:
-            res = line_pool.browse(cr, uid, ids)[0].value
+            res = line_pool.browse(cr, uid, ids, context=context)[0].value
         return res
 
 company_contribution()
@@ -645,9 +667,12 @@ class hr_payslip(osv.osv):
     _name = 'hr.payslip'
     _description = 'Pay Slip'
 
-    def _calculate(self, cr, uid, ids, field_names, arg, context):
+    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):
+        for rs in self.browse(cr, uid, ids, context=context):
             allow = 0.0
             deduct = 0.0
             others = 0.0
@@ -698,7 +723,7 @@ class hr_payslip(osv.osv):
                 elif line.type == 'otherpay':
                     others += amount
 
-                self.pool.get('hr.payslip.line').write(cr, uid, [line.id], {'total':amount})
+                slip_line_obj.write(cr, uid, [line.id], {'total':amount}, context=context)
 
             record = {
                 'allounce':round(allow),
@@ -759,6 +784,8 @@ 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,
@@ -770,7 +797,7 @@ class hr_payslip(osv.osv):
             'basic_before_leaves':0,
             'basic':0
         }
-        res_id = super(hr_payslip, self).copy(cr, uid, id, default, context)
+        res_id = super(hr_payslip, self).copy(cr, uid, id, default, context=context)
         return res_id
 
     def create_voucher(self, cr, uid, ids, name, voucher, sequence=5):
@@ -784,31 +811,45 @@ class hr_payslip(osv.osv):
             }
             slip_move.create(cr, uid, res)
 
-    def set_to_draft(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'draft'})
+    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={}):
-        self.write(cr, uid, ids, {'state':'cancel'})
+    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={}):
-        self.write(cr, uid, ids, {'state':'accont_check'})
+    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={}):
-        self.write(cr, uid, ids, {'state':'hr_check'})
+    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={}):
-        self.write(cr, uid, ids, {'state':'done'})
+
+    def process_sheet(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        self.write(cr, uid, ids, {'state':'done'}, context=context)
         return True
-    
-    def verify_sheet(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'confirm'})
+
+    def verify_sheet(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        self.write(cr, uid, ids, {'state':'confirm'}, context=context)
         return True
-    
-    def get_contract(self, cr, uid, employee, date, context={}):
+
+    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
@@ -828,7 +869,7 @@ class hr_payslip(osv.osv):
 
         return contract
 
-    def _get_leaves(self, cr, user, slip, employee, context={}):
+    def _get_leaves(self, cr, user, slip, employee, context=None):
         """
         Compute leaves for an employee
 
@@ -840,7 +881,8 @@ class hr_payslip(osv.osv):
 
         @return: return a result
         """
-
+        if context is None:
+            context = {}
         result = []
 
         dates = prev_bounds(slip.date)
@@ -856,14 +898,17 @@ class hr_payslip(osv.osv):
 
         return result
 
-    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')
         holiday_pool = self.pool.get('hr.holidays')
-
-        date = self.read(cr, uid, ids, ['date'])[0]['date']
+        contract_obj = self.pool.get('hr.contract')
+        sequence_obj = self.pool.get('ir.sequence')
+        if context is None:
+            context = {}
+        date = self.read(cr, uid, ids, ['date'], context=context)[0]['date']
 
         #Check for the Holidays
         def get_days(start, end, month, year, calc_day):
@@ -874,25 +919,25 @@ class hr_payslip(osv.osv):
                     count += 1
             return count
 
-        for slip in self.browse(cr, uid, ids):
+        for slip in self.browse(cr, uid, ids, context=context):
             contracts = self.get_contract(cr, uid, slip.employee_id, date, context)
 
             if contracts.get('id', False) == False:
                 continue
 
-            contract = self.pool.get('hr.contract').browse(cr, uid, contracts.get('id'))
+            contract = contract_obj.browse(cr, uid, contracts.get('id'), context=context)
             sal_type = contract.wage_type_id.type
             function = contract.struct_id.id
 
             lines = []
             if function:
-                func = func_pool.read(cr, uid, function, ['line_ids'])
-                lines = slip_line_pool.browse(cr, uid, func['line_ids'])
+                func = func_pool.read(cr, uid, function, ['line_ids'], context=context)
+                lines = slip_line_pool.browse(cr, uid, func['line_ids'], context=context)
 
             lines += slip.employee_id.line_ids
 
-            old_slip_id = slip_line_pool.search(cr, uid, [('slip_id','=',slip.id)])
-            slip_line_pool.unlink(cr, uid, old_slip_id)
+            old_slip_ids = slip_line_pool.search(cr, uid, [('slip_id','=',slip.id)], context=context)
+            slip_line_pool.unlink(cr, uid, old_slip_ids, context=context)
 
             ad = []
             lns = {}
@@ -972,14 +1017,14 @@ class hr_payslip(osv.osv):
                         value = line.amount
 
                     elif line.amount_type == 'func':
-                        value = self.pool.get('hr.payslip.line').execute_function(cr, uid, line.id, amt, context)
+                        value = slip_line_pool.execute_function(cr, uid, line.id, amt, context)
                         line.amount = value
                 else:
                     if line.amount_type in ('fix', 'per'):
                         value = line.amount
-                    
+
                     elif line.amount_type == 'func':
-                        value = self.pool.get('hr.payslip.line').execute_function(cr, uid, line.id, amt, context)
+                        value = slip_line_pool.execute_function(cr, uid, line.id, amt, context)
                         line.amount = value
 
                 if line.type == 'allowance':
@@ -997,7 +1042,7 @@ class hr_payslip(osv.osv):
                     'base':base
                 }
                 slip_line_pool.copy(cr, uid, line.id, vals, {})
-            
+
             if sal_type in ('gross', 'net'):
                 sal = contract.wage
                 if sal_type == 'net':
@@ -1015,7 +1060,7 @@ class hr_payslip(osv.osv):
             else:
                 basic = contract.wage
 
-            number = self.pool.get('ir.sequence').get(cr, uid, 'salary.slip')
+            number = sequence_obj.get(cr, uid, 'salary.slip')
             ttyme = datetime.fromtimestamp(time.mktime(time.strptime(slip.date,"%Y-%m-%d")))
             update.update({
                 'deg_id':function,
@@ -1027,9 +1072,9 @@ class hr_payslip(osv.osv):
                 'contract_id':contract.id,
                 'company_id':slip.employee_id.company_id.id
             })
-            self.write(cr, uid, [slip.id], update)
+            self.write(cr, uid, [slip.id], update, context=context)
 
-        for slip in self.browse(cr, uid, ids):
+        for slip in self.browse(cr, uid, ids, context=context):
 
             if not slip.contract_id :
                 continue
@@ -1055,7 +1100,7 @@ class hr_payslip(osv.osv):
 
             total_leave = 0.0
             paid_leave = 0.0
-            for hday in holiday_pool.browse(cr, uid, leave_ids):
+            for hday in holiday_pool.browse(cr, uid, leave_ids, context=context):
                 res = {
                     'slip_id':slip.id,
                     'name':hday.holiday_status_id.name + '-%s' % (hday.number_of_days),
@@ -1089,7 +1134,7 @@ class hr_payslip(osv.osv):
                     leave += days
                     total += perday * days
 
-                slip_line_pool.create(cr, uid, res)
+                slip_line_pool.create(cr, uid, res, context=context)
             basic = basic - total
             leaves = total
 
@@ -1100,7 +1145,7 @@ class hr_payslip(osv.osv):
                 'worked_days':working_day - leave,
                 'working_days':working_day,
             })
-            self.write(cr, uid, [slip.id], update)
+            self.write(cr, uid, [slip.id], update, context=context)
 
         return True
 
@@ -1145,27 +1190,6 @@ class hr_payslip_line(osv.osv):
     _name = 'hr.payslip.line'
     _description = 'Payslip Line'
 
-#    def _calculate(self, cr, uid, ids, field_names, arg, context):
-#        res = {}
-#        obj = {}
-#        for line in self.browse(cr, uid, ids, context):
-#            obj['basic'] = line.slip_id.basic
-#            amount = 0.0
-#
-#            if line.amount_type == 'per' and line.base:
-#                print 'XXXXXXXXXXXXXXXX : ', obj
-#                amount = line.amount * eval(line.base, obj)
-#            elif line.amount_type in ('fix', 'func'):
-#                amount = line.amount
-
-#            cd = line.category_id.code.lower()
-#            obj[cd] = amount
-#            print 'XXXXXXXXXXXXXXXXXX : ', cd
-#
-#            res[line.id] = amount
-#        print 'XXXXXXXXXXXX : ', obj
-#        return res
-
     def onchange_category(self, cr, uid, ids, category_id):
         seq = 0
         res = {
@@ -1224,18 +1248,20 @@ class hr_payslip_line(osv.osv):
     }
     _order = 'sequence'
 
-    def execute_function(self, cr, uid, id, value, context):
+    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)])
+        ids = line_pool.search(cr, uid, [('slipline_id','=',id), ('from_val','<=',value), ('to_val','>=',value)], context=context)
 
         if not ids:
-            ids = line_pool.search(cr, uid, [('slipline_id','=',id), ('from_val','<=',value)])
+            ids = line_pool.search(cr, uid, [('slipline_id','=',id), ('from_val','<=',value)], context=context)
 
         if not ids:
             return res
 
-        res = line_pool.browse(cr, uid, ids)[-1].value
+        res = line_pool.browse(cr, uid, ids, context=context)[-1].value
         return res
 
 hr_payslip_line()
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml
index 80a66722efc..fc9a58f76b4 100644
--- a/addons/hr_payroll/hr_payroll_data.xml
+++ b/addons/hr_payroll/hr_payroll_data.xml
@@ -1,112 +1,130 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <record id="HRA" model="hr.allounce.deduction.categoty">
             <field name="code">HRA</field>
             <field name="type">allowance</field>
             <field name="name">House Rant Allowance</field>
+            <field name="sequence" eval="5"/>
         </record>
         
         <record id="CA" model="hr.allounce.deduction.categoty">
             <field name="code">CA</field>
             <field name="type">allowance</field>
             <field name="name">Convance Allowance</field>
+            <field name="sequence" eval="10"/>
         </record>
         
         <record id="MA" model="hr.allounce.deduction.categoty">
             <field name="code">MA</field>
             <field name="type">allowance</field>
             <field name="name">Meducal Allowance</field>
+            <field name="sequence" eval="15"/>
         </record>
 
         <record id="TELA" model="hr.allounce.deduction.categoty">
             <field name="code">TELA</field>
             <field name="type">allowance</field>
             <field name="name">Telephone Allowance</field>
+            <field name="sequence" eval="20"/>
         </record>
         
         <record id="LTA" model="hr.allounce.deduction.categoty">
             <field name="code">LTA</field>
             <field name="type">allowance</field>
             <field name="name">Leave Travel Allowance</field>
+            <field name="sequence" eval="25"/>
         </record>
         
         <record id="NA" model="hr.allounce.deduction.categoty">
             <field name="code">NA</field>
             <field name="type">allowance</field>
             <field name="name">Newspaper Allowance</field>
+            <field name="sequence" eval="30"/>
         </record>
         
         <record id="TA" model="hr.allounce.deduction.categoty">
             <field name="code">TA</field>
             <field name="type">allowance</field>
             <field name="name">Traveling Allowance</field>
+            <field name="sequence" eval="35"/>
         </record>
         
         <record id="FA" model="hr.allounce.deduction.categoty">
             <field name="code">FA</field>
             <field name="type">allowance</field>
             <field name="name">Food Allowance</field>
+            <field name="sequence" eval="40"/>
         </record>
         
         <record id="DA" model="hr.allounce.deduction.categoty">
             <field name="code">DA</field>
             <field name="type">allowance</field>
             <field name="name">Dearness Allowance</field>
+            <field name="sequence" eval="45"/>
         </record>
         
         <record id="PF" model="hr.allounce.deduction.categoty">
             <field name="code">PF</field>
             <field name="type">deduction</field>
             <field name="name">Provident Fund</field>
+            <field name="sequence" eval="50"/>
         </record>
         
         <record id="PT" model="hr.allounce.deduction.categoty">
             <field name="code">PT</field>
             <field name="type">deduction</field>
             <field name="name">Professional Tax</field>
+            <field name="sequence" eval="55"/>
         </record>
         
         <record id="WF" model="hr.allounce.deduction.categoty">
             <field name="code">WF</field>
             <field name="type">deduction</field>
             <field name="name">Welfare</field>
+            <field name="sequence" eval="60"/>
         </record>
         
         <record id="TDS" model="hr.allounce.deduction.categoty">
             <field name="code">TDS</field>
             <field name="type">deduction</field>
             <field name="name">Tax Deduct at Source</field>
+            <field name="sequence" eval="65"/>
         </record>
         
         <record id="LWP" model="hr.allounce.deduction.categoty">
             <field name="code">LWP</field>
             <field name="type">deduction</field>
             <field name="name">Leave without pay</field>
+            <field name="sequence" eval="70"/>
         </record>
         
         <record id="FC" model="hr.allounce.deduction.categoty">
             <field name="code">FC</field>
             <field name="type">deduction</field>
             <field name="name">Food Coupons</field>
+            <field name="sequence" eval="75"/>
         </record>
         
         <record id="ESI" model="hr.allounce.deduction.categoty">
             <field name="code">ESI</field>
             <field name="type">deduction</field>
             <field name="name">Employee's State Insurance</field>
+            <field name="sequence" eval="80"/>
         </record>
         
         <record id="OTHERD" model="hr.allounce.deduction.categoty">
             <field name="code">OTHERD</field>
             <field name="type">deduction</field>
             <field name="name">Other Deduction</field>
+            <field name="sequence" eval="85"/>
         </record>
         
         <record id="OTHERA" model="hr.allounce.deduction.categoty">
             <field name="code">OTHERA</field>
             <field name="type">allowance</field>
             <field name="name">Other Taxable Allowance</field>
+            <field name="sequence" eval="90"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 2d77c1d820e..9c2ce90cd7a 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -8,6 +8,7 @@
             <field name="name">Marketing Executive</field>
             <field name="company_id" ref="base.main_company"/>
         </record>
+
         <record id="hr_payslip_line_houserantallowance1" model="hr.payslip.line">
             <field name="amount_type">per</field>
             <field name="account_id" ref="account.a_expense"/>
@@ -19,6 +20,7 @@
             <field name="function_id" ref="hr_payroll.structure_001"/>
             <field name="name">House Rant Allowance</field>
         </record>
+
         <record id="hr_payslip_line_convanceallowance1" model="hr.payslip.line">
             <field name="amount_type">fix</field>
             <field name="account_id" ref="account.a_expense"/>
@@ -30,6 +32,7 @@
             <field name="function_id" ref="hr_payroll.structure_001"/>
             <field name="name">Convance Allowance</field>
         </record>
+
         <record id="hr_payslip_line_professionaltax1" model="hr.payslip.line">
             <field name="amount_type">fix</field>
             <field name="account_id" ref="account.a_pay"/>
@@ -41,6 +44,7 @@
             <field name="function_id" ref="hr_payroll.structure_001"/>
             <field name="name">Professional Tax</field>
         </record>
+
         <record id="hr_payslip_line_providentfund1" model="hr.payslip.line">
             <field name="amount_type">per</field>
             <field name="account_id" ref="account.a_pay"/>
@@ -52,7 +56,7 @@
             <field name="function_id" ref="hr_payroll.structure_001"/>
             <field name="name">Provident Fund</field>
         </record>
-        
+
         <!-- Employee -->
         <record id="hr_employee_bonamy0" model="hr.employee">
             <field eval="0" name="manager"/>
@@ -62,7 +66,7 @@
             <field name="name">Bonamy</field>
             <field name="resource_type">user</field>
         </record>
-        
+
         <!-- Employee Contract -->
         <record id="hr_contract_firstcontract1" model="hr.contract">
             <field name="wage_type_id" ref="hr_contract.hr_contract_monthly_gross"/>
@@ -74,7 +78,7 @@
             <field eval="4000.0" name="wage"/>
             <field eval="5" name="working_days_per_week"/>
         </record>
-        
+
         <!-- Payslip -->
         <record id="hr_payslip_salaryslipofbonamyforjune0" model="hr.payslip">
             <field name="number">SLIP/001</field>
@@ -87,6 +91,6 @@
             <field name="bank_journal_id" ref="account.bank_journal"/>
             <field name="name">Salary Slip of Bonamy for June-2010</field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a85fcc2462c..23fbd983483 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -6,7 +6,6 @@
         <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll"/>
 
-        
         <!-- Passport Views    -->
         <record id="hr_passport_form" model="ir.ui.view">
             <field name="name">hr.passport.form</field>
@@ -424,7 +423,7 @@
             <field name="model">hr.payslip</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Payslip">
+                <tree colors="blue:state in ('draft');black:state in ('confirm','new','hr_check','accont_check');gray:state in('done','cancel')" string="Payslip">
                     <field name="number"/>
                     <field name="employee_id"/>
                     <field name="name"/>
@@ -505,9 +504,10 @@
                         <button string="Compute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" states="new"/>
                         <button string="Recompute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" type="object" states="draft"/>
                         <button string="Verify Sheet" icon="terp-camera_test" name="verify_sheet" states="draft"/>
-                        <button string="Validate Sheet" icon="terp-camera_test" name="final_verify_sheet" states="hr_check"/>
+                        <button string="Approve Sheet" icon="terp-camera_test" name="final_verify_sheet" states="hr_check"/>
                         <button string="Pay Salary" icon="terp-dolar_ok!" name="process_sheet" states="confirm"/>
                         <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm"/>
+                        <button string="Re-Open" icon="terp-stock_effects-object-colorize" name="set_to_draft" states="draft,hr_check,confirm"/>
                         <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="set_to_draft" states="cancel"/>
                     </group>
                 </form>
@@ -851,7 +851,7 @@
             <field name="model">hr.payroll.register</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Payroll Register">
+                <tree  colors="blue:state in ('draft');black:state in ('confirm','new','hr_check','accont_check');gray:state in('done','cancel')" string="Payroll Register">
                     <field name="number"/>
                     <field name="name"/>
                     <field name="date"/>
@@ -878,7 +878,7 @@
                     <notebook colspan="4">
                         <page string="Payslips">
                             <field name="line_ids" colspan="4" nolabel="1">
-                                <tree string="Payslip">
+                                <tree colors="blue:state in ('draft');black:state in ('confirm','new','hr_check','accont_check');gray:state in('done','cancel')" string="Payslip">
                                     <field name="number"/>
                                     <field name="employee_id"/>
                                     <field name="name"/>
diff --git a/addons/hr_payroll/hr_payroll_wizard.xml b/addons/hr_payroll/hr_payroll_wizard.xml
index fe0264257e3..71267ddb742 100644
--- a/addons/hr_payroll/hr_payroll_wizard.xml
+++ b/addons/hr_payroll/hr_payroll_wizard.xml
@@ -25,16 +25,5 @@
             parent="menu_hr_payroll_reporting" 
             name="Employee Salary Statement"
             type="wizard"/>
-
-<!--        <wizard id="wizard_payroll_analysis"-->
-<!--            menu="False" -->
-<!--            model="account.analytic.account" -->
-<!--            name="payroll.analysis" -->
-<!--            string="Create Analytic Structure"/>-->
-<!--        <menuitem  id="menu_wizard_payroll_analysis" -->
-<!--            action="wizard_payroll_analysis" -->
-<!--            parent="payroll_configure" -->
-<!--            name="Create Analytic Structure"-->
-<!--            type="wizard"/>-->
     </data>
 </openerp>
diff --git a/addons/hr_payroll/i18n/pl.po b/addons/hr_payroll/i18n/pl.po
new file mode 100644
index 00000000000..ddc6db33237
--- /dev/null
+++ b/addons/hr_payroll/i18n/pl.po
@@ -0,0 +1,1440 @@
+# Polish 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: 2009-11-25 13:16+0000\n"
+"PO-Revision-Date: 2010-07-26 10:59+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-07-27 03:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "E-mail Address"
+msgstr "Adres e-mail"
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "(Based on type Payroll will calculate basic salary)"
+msgstr "(Oparty na Liście płac do obliczeń podstawowych wynagrodzeń)"
+
+#. module: hr_payroll
+#: field:hr.payroll.register,net:0
+#: field:hr.payslip,net:0
+msgid "Net Salary"
+msgstr "Wynagrodzenie netto"
+
+#. module: hr_payroll
+#: field:hr.payslip,working_days:0
+msgid "Working Days"
+msgstr "Dni pracy"
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Axis Bank"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,esp_account:0
+msgid "EPS Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr "Konto analityczne do analizy wynagrodzeń"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+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
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Department"
+msgstr "Dział"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,gratuity:0
+msgid "Use for Gratuity ?"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Employee No"
+msgstr "Nr pracownika"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Salary Payment Register"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Paid ? "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
+msgid "Year Salary Report"
+msgstr "Raport wynagrodzeń rocznych"
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Paid Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,flag:0
+msgid "D/C"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,company_id:0
+#: field:hr.payslip,company_id:0
+#: wizard_field:payroll.analysis,init,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: hr_payroll
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid ","
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Set to Draft"
+msgstr "Ustaw na projekt"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Half-Pay Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,other_pay:0
+msgid "Others"
+msgstr "Inne"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,slip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip
+#: rml:payslip.pdf:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Calculations Rules"
+msgstr "Reguły obliczeń"
+
+#. module: hr_payroll
+#: model:ir.module.module,description:hr_payroll.module_meta_information
+msgid ""
+"\n"
+"    The Payroll system - India, Manages and depends on,\n"
+"    * HR Details\n"
+"    * HR Contracts\n"
+"    * HR Payslip\n"
+"    * HR Paysheet\n"
+"    * HR Attendance\n"
+"    * HR Holidays\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: rml:salary.structure:0
+msgid "Salary"
+msgstr "Wynagrodzenie"
+
+#. module: hr_payroll
+#: field:hr.holidays.status,account_id:0
+msgid "Account"
+msgstr "Konto"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Payment From"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Miscelleanous / Statutory"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Leaves"
+msgstr "Nieobecności"
+
+#. module: hr_payroll
+#: field:hr.payslip,register_id:0
+msgid "Register"
+msgstr "Rejestr"
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Next Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,value:0
+msgid "Value"
+msgstr "Wartość"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Name of the Employee"
+msgstr "Nazwisko pracownika"
+
+#. module: hr_payroll
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,amount:0
+#: rml:payroll.advice:0
+msgid "Amount"
+msgstr "Kwota"
+
+#. module: hr_payroll
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,country_id:0
+msgid "Country of Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Ostrzeżenie !"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please Confirm all Expanse Invoice appear for Reimbursement"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_expire:0
+msgid "Passport Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Special Allowance and Deductions for Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Un-Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "Wymuś okres"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,type:0
+msgid "Payment"
+msgstr "Wypłata"
+
+#. module: hr_payroll
+#: field:hr.employee,analytic_account:0
+#: field:hr.employee.grade,account_id:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+#: rml:salary.structure:0
+msgid "Analytic Account"
+msgstr "Konto analityczne"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Expanse To"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,base:0
+msgid "Based on"
+msgstr "Bazując na"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Bank"
+msgstr "Bank"
+
+#. module: hr_payroll
+#: field:hr.payslip,move_id:0
+msgid "Expanse Entries"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
+msgid "Human Resource Payroll"
+msgstr "Lista płac"
+
+#. module: hr_payroll
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych"
+
+#. module: hr_payroll
+#: field:hr.employee,esi_account:0
+msgid "ESI Account"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_passport
+msgid "Passport Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please defined the Employee Home Address Along with Partners !!"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,total:0
+msgid "Sub Total"
+msgstr "Suma"
+
+#. module: hr_payroll
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,from:0
+msgid "From"
+msgstr "Od"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
+msgid "Employee Year Salary"
+msgstr "Wynagrodzenie roczne"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+msgid "Authorised Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,umo_id:0
+msgid "Unite"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Notes:"
+msgstr "Uwagi:"
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "End Date"
+msgstr "Data końcowa"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Amount Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,passport_id:0
+#: field:hr.employee,passport_id:0
+#: view:hr.passport:0
+msgid "Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,employee_id:0
+#: field:hr.payroll.advice.line,employee_id:0
+#: field:hr.payslip,employee_id:0
+#: field:hr.payslip.line,employee_id:0
+msgid "Employee"
+msgstr "Pracownik"
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Start Date"
+msgstr "Data Początkowa"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,type:0
+#: field:hr.payslip.line,type:0
+#: wizard_field:payroll.analysis,init,type:0
+#: rml:salary.structure:0
+msgid "Type"
+msgstr "Typ"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "#"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Miscelleanous"
+msgstr "Różne"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Integrity Error !"
+msgstr "Błąd integracji !"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,pan_no:0
+msgid "PAN No"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_button:wizard.employees.detail,init,report:0
+#: wizard_button:wizard.year.salary,init,report:0
+msgid "Print"
+msgstr "Drukuj"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr "Informacje o koncie"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Contributions Configuration"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,grows:0
+#: field:hr.payslip,grows:0
+msgid "Gross Salary"
+msgstr "Wynagrodzenie brutto"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Basic Salary - Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:payroll.analysis,init,type:0
+msgid "By Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr "Wymagrodzenie pracownika"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.wizard,name:hr_payroll.wizard_print_year_salary
+msgid "Year Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Fixed Amount"
+msgstr "Kwota stała"
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr ""
+
+#. 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
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Gross SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please defined the Partner in Home Address !!"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "For the month of"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,deduction:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,deduction:0
+#: selection:hr.payslip.line,type:0
+msgid "Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Passport List"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,payment_id:0
+msgid "Payment Entries"
+msgstr "Zapisy płatności"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "YTD"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,expanse_id:0
+msgid "Expense"
+msgstr "Wydatek"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+msgid "Fided Value"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan Installment"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Complete HR Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Allowances"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Net Amount"
+msgstr "Kwota netto"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payroll.advice,state:0
+#: field:hr.payroll.register,state:0
+#: field:hr.payslip,state:0
+msgid "State"
+msgstr "Stan"
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Salary Structure:"
+msgstr "Struktura wynagrodzenia:"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
+msgid "Employees Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_employee_grade
+msgid "Function of the Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Confirm Sheet"
+msgstr "Potwierdź listę"
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Account Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Others:"
+msgstr "Inne:"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.passport,contracts_ids:0
+msgid "Contracts"
+msgstr "Umowy"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Passport and Visa"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employee Code"
+msgstr "Kod pracownika"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: field:hr.payslip.line,amount_type:0
+#: rml:salary.structure:0
+msgid "Amount Type"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: field:hr.payslip.line,category_id:0
+#: rml:salary.structure:0
+msgid "Category"
+msgstr "Kategoria"
+
+#. module: hr_payroll
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr "Dziennik bankowy"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Total SAL"
+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
+#: field:hr.employee,hospital_id:0
+msgid "ESI Hospital"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0
+#: view:hr.payroll.register:0
+#: field:hr.payroll.register,line_ids:0
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Reject"
+msgstr "Odrzucone"
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
+msgid "All Passports"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "Employee Name"
+msgstr "Nazwisko pracownika"
+
+#. module: hr_payroll
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr "Konto wynagrodzenia"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Percentage (%)"
+msgstr "Procentowo (%)"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,register_id:0
+#: view:hr.payroll.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
+#: model:ir.model,name:hr_payroll.model_hr_payroll_register
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "For"
+msgstr "Dla"
+
+#. module: hr_payroll
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expanse Journal"
+msgstr "Dziennik wydatków"
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_contract
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,contribute:0
+msgid "Contribe by Company ?"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,working_days_per_week:0
+msgid "Working Days / Week"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Complete Accountant Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Title"
+msgstr "Tytuł"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+msgid "On Attendance"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
+msgid "Allowance/Deduction Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr "Aktywne"
+
+#. module: hr_payroll
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr "Konto pracownika"
+
+#. module: hr_payroll
+#: rml:year.salary:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr "Warunek"
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for HR Verification"
+msgstr "Oczekiwanie na weryfikację"
+
+#. module: hr_payroll
+#: field:hr.employee,pf_account:0
+msgid "PF Account"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Compute"
+msgstr "Oblicz"
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr "Pozycje płatności"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: field:hr.payslip,deg_id:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "HR Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payslip,basic_before_leaves:0
+#: rml:payslip.pdf:0
+msgid "Basic Salary"
+msgstr "Wynagrodzenie podstawowe"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,code:0
+msgid "Categoty Code"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Salary Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
+msgid "Allowance Deduction Categoty"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Allowance / Deduction Category"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr "Projekt listy"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:hr.payroll.register,date:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Basic SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Phone No."
+msgstr "Nr. Telefonu"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,include_in_salary:0
+msgid "Included in Salary ?"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.expense.expense,category_id:0
+#: field:hr.holidays.status,head_id:0
+msgid "Payroll Head"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,account_id:0
+#: rml:salary.structure:0
+msgid "General Account"
+msgstr "Konto główne"
+
+#. module: hr_payroll
+#: field:hr.holidays.status,code:0
+#: field:hr.payslip.line,code:0
+#: rml:salary.structure:0
+msgid "Code"
+msgstr "Kod"
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
+#: rml:payroll.advice:0
+msgid "Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,to:0
+msgid "To"
+msgstr "Do"
+
+#. module: hr_payroll
+#: wizard_button:payroll.analysis,init,process:0
+msgid "Process"
+msgstr "Przetwórz"
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan"
+msgstr "Pożyczka"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,sequence:0
+msgid "Sequence"
+msgstr "Numeracja"
+
+#. module: hr_payroll
+#: wizard_field:wizard.year.salary,init,salary_on:0
+msgid "Salary On"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,number:0
+#: field:hr.payroll.register,number:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,number:0
+msgid "Number"
+msgstr "Numer"
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Contract Detail:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "General Information"
+msgstr "Informacje ogólne"
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.employee,line_ids:0
+#: view:hr.employee.grade:0
+#: field:hr.employee.grade,line_ids:0
+#: rml:salary.structure:0
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+#: wizard_button:payroll.analysis,init,end:0
+#: wizard_button:wizard.employees.detail,init,end:0
+#: wizard_button:wizard.year.salary,init,end:0
+msgid "Cancel"
+msgstr "Anuluj"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount:0
+#: rml:salary.structure:0
+msgid "Amount / Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Current Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Contract Duration"
+msgstr "Czas trwania umowy"
+
+#. module: hr_payroll
+#: wizard_view:payroll.analysis,init:0
+msgid "Process Form"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,name:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Account Information"
+msgstr "Informacje o koncie"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Generalities"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "for period"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "E-mail"
+msgstr "Adres email"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,line_ids:0
+msgid "Calculations"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_view:wizard.year.salary,init:0
+msgid "Salary Deposit Date Option?"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee.grade,function_id:0
+#: field:hr.payslip.line,function_id:0
+msgid "Function"
+msgstr "Funkcja"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Droga(i) Pani(e)"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "PAN No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: hr_payroll
+#: field:hr.employee,pg_joining:0
+msgid "PF Join Date"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+msgid "Payroll"
+msgstr "Lista płac"
+
+#. module: hr_payroll
+#: wizard_view:wizard.employees.detail,init:0
+#: wizard_view:wizard.year.salary,init:0
+msgid "Year Salary"
+msgstr "Wynagrodzenie roczne"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,name:0
+msgid "Categoty Name"
+msgstr "Nazwa kategorii"
+
+#. module: hr_payroll
+#: model:ir.actions.wizard,name:hr_payroll.wizard_payroll_analysis
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_payroll_analysis
+msgid "Create Analytic Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Address"
+msgstr "Adres"
+
+#. module: hr_payroll
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expanse will be Paid"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,salary_account:0
+msgid "Expanse account when Salary Expanse will be recorded"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Notes"
+msgstr "Uwagi"
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.payroll_configure
+msgid "Configure Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Advance"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Special Allowances and Deductions For Employee:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,name:0
+#: field:hr.payroll.advice,name:0
+#: field:hr.payroll.register,name:0
+#: field:hr.payslip,name:0
+#: field:hr.payslip.line,name:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "Name"
+msgstr "Nazwa"
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leaved Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Statutory Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
+msgid "Employee Functions"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.employees.detail,init,employee_ids:0
+#: wizard_field:wizard.year.salary,init,employee_ids:0
+msgid "Employees"
+msgstr "Pracownicy"
+
+#. module: hr_payroll
+#: field:hr.employee,property_bank_account:0
+#: rml:payroll.advice:0
+msgid "Bank Account"
+msgstr "Konto Bankowe"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.employees.detail,init,fiscalyear_id:0
+#: wizard_field:wizard.year.salary,init,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr "Rok podatkowy"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Contract"
+msgstr "Umowa"
+
+#. module: hr_payroll
+#: selection:payroll.analysis,init,type:0
+msgid "By Allownce / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Payroll Configurtion"
+msgstr "Konfiguracja listy płac"
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,allounce:0
+#: field:hr.payslip,allounce:0
+#: selection:hr.payslip.line,type:0
+msgid "Allowance"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Bank Details"
+msgstr "Szczegóły banku"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "By Sal"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Net SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
+msgid "Print Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payroll.advice:0
+#: rml:year.salary:0
+msgid "Total"
+msgstr "Suma"
diff --git a/addons/hr_payroll/i18n/zh_CN.po b/addons/hr_payroll/i18n/zh_CN.po
new file mode 100644
index 00000000000..b7c4e7c687e
--- /dev/null
+++ b/addons/hr_payroll/i18n/zh_CN.po
@@ -0,0 +1,1446 @@
+# 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: 2009-11-25 13:16+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-07-21 03:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "E-mail Address"
+msgstr "E-mail地址"
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "(Based on type Payroll will calculate basic salary)"
+msgstr "(根据工资类型计算基本薪酬)"
+
+#. module: hr_payroll
+#: field:hr.payroll.register,net:0
+#: field:hr.payslip,net:0
+msgid "Net Salary"
+msgstr "净薪酬"
+
+#. module: hr_payroll
+#: field:hr.payslip,working_days:0
+msgid "Working Days"
+msgstr "工作天数"
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr "新工资单"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Axis Bank"
+msgstr "Axis银行"
+
+#. module: hr_payroll
+#: field:hr.employee,esp_account:0
+msgid "EPS Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr "薪酬分析的辅助核算项"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+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
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Department"
+msgstr "部门"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Deductions:"
+msgstr "扣除："
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,gratuity:0
+msgid "Use for Gratuity ?"
+msgstr "用于小费?"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Employee No"
+msgstr "员工编号"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Salary Payment Register"
+msgstr "薪酬支付记录"
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Paid ? "
+msgstr "已付? "
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
+msgid "Year Salary Report"
+msgstr "年薪报表"
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Paid Salary"
+msgstr "支付薪酬"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,flag:0
+msgid "D/C"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,company_id:0
+#: field:hr.payslip,company_id:0
+#: wizard_field:payroll.analysis,init,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: hr_payroll
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr "员工帐号"
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr "信中详述"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid ","
+msgstr ","
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Set to Draft"
+msgstr "设为草稿"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "The Manager"
+msgstr "经理"
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Half-Pay Holiday"
+msgstr "半薪假期"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,other_pay:0
+msgid "Others"
+msgstr "其它"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,slip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip
+#: rml:payslip.pdf:0
+msgid "Pay Slip"
+msgstr "工资单"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Calculations Rules"
+msgstr "计算规则"
+
+#. module: hr_payroll
+#: model:ir.module.module,description:hr_payroll.module_meta_information
+msgid ""
+"\n"
+"    The Payroll system - India, Manages and depends on,\n"
+"    * HR Details\n"
+"    * HR Contracts\n"
+"    * HR Payslip\n"
+"    * HR Paysheet\n"
+"    * HR Attendance\n"
+"    * HR Holidays\n"
+"    "
+msgstr ""
+"\n"
+"    这薪酬系统- 印度, 管理和开发的\n"
+"   人力资源细节\n"
+"   人力资源合同\n"
+"   人力资源工资单\n"
+"   人力资源工资\n"
+"   人力资源假期\n"
+"    "
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: rml:salary.structure:0
+msgid "Salary"
+msgstr "薪酬"
+
+#. module: hr_payroll
+#: field:hr.holidays.status,account_id:0
+msgid "Account"
+msgstr "帐户"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Payment From"
+msgstr "付款来自"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Miscelleanous / Statutory"
+msgstr "不规则/ 法定的"
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Leaves"
+msgstr "叶节点"
+
+#. module: hr_payroll
+#: field:hr.payslip,register_id:0
+msgid "Register"
+msgstr "记录"
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Next Month Date"
+msgstr "下个月日期"
+
+#. module: hr_payroll
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr "为空使用确认(工资单)日期"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,value:0
+msgid "Value"
+msgstr "值"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Name of the Employee"
+msgstr "这员工姓名"
+
+#. module: hr_payroll
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr "工作许可证编号"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,amount:0
+#: rml:payroll.advice:0
+msgid "Amount"
+msgstr "金额"
+
+#. module: hr_payroll
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "工资单明细"
+
+#. module: hr_payroll
+#: field:hr.passport,country_id:0
+msgid "Country of Issue"
+msgstr "国家发行"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Warning !"
+msgstr "警告 !"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please Confirm all Expanse Invoice appear for Reimbursement"
+msgstr "请确认所有退款显示的支出发票"
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Deduction"
+msgstr "其它扣除"
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Paid Holiday"
+msgstr "带薪假期"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employees Salary Details"
+msgstr "员工薪酬细节"
+
+#. module: hr_payroll
+#: field:hr.passport,date_expire:0
+msgid "Passport Expire Date"
+msgstr "护照到期日期"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Special Allowance and Deductions for Employee"
+msgstr "特别津贴和员工的扣除"
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Un-Paid Holiday"
+msgstr "不带薪假期"
+
+#. module: hr_payroll
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "强制期间"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Amount (in words) :"
+msgstr "金额(口头上):"
+
+#. module: hr_payroll
+#: field:hr.holidays.status,type:0
+msgid "Payment"
+msgstr "付款"
+
+#. module: hr_payroll
+#: field:hr.employee,analytic_account:0
+#: field:hr.employee.grade,account_id:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+#: rml:salary.structure:0
+msgid "Analytic Account"
+msgstr "辅助核算项"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Expanse To"
+msgstr "支出到"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,base:0
+msgid "Based on"
+msgstr "基于"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Bank"
+msgstr "银行"
+
+#. module: hr_payroll
+#: field:hr.payslip,move_id:0
+msgid "Expanse Entries"
+msgstr "支出记录"
+
+#. module: hr_payroll
+#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
+msgid "Human Resource Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "错误! 你不能创建递归的辅助核算项"
+
+#. module: hr_payroll
+#: field:hr.employee,esi_account:0
+msgid "ESI Account"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_passport
+msgid "Passport Detail"
+msgstr "护照详细资料"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please defined the Employee Home Address Along with Partners !!"
+msgstr "请定义业务伙伴员工的家庭地址!"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,total:0
+msgid "Sub Total"
+msgstr "小计"
+
+#. module: hr_payroll
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,from:0
+msgid "From"
+msgstr "来自"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr "按薪酬"
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
+msgid "Employee Year Salary"
+msgstr "员工年薪"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+msgid "Employee PaySlip"
+msgstr "员工工资单"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+msgid "Authorised Signature"
+msgstr "授权签署"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,umo_id:0
+msgid "Unite"
+msgstr "合并"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Detail"
+msgstr "薪酬细节"
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Notes:"
+msgstr "备注："
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "End Date"
+msgstr "结束日期"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Accounting Information"
+msgstr "会计信息"
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Amount Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,passport_id:0
+#: field:hr.employee,passport_id:0
+#: view:hr.passport:0
+msgid "Passport"
+msgstr "护照"
+
+#. module: hr_payroll
+#: field:hr.passport,employee_id:0
+#: field:hr.payroll.advice.line,employee_id:0
+#: field:hr.payslip,employee_id:0
+#: field:hr.payslip.line,employee_id:0
+msgid "Employee"
+msgstr "员工"
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Start Date"
+msgstr "开始日期"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr "银行通知明细"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,type:0
+#: field:hr.payslip.line,type:0
+#: wizard_field:payroll.analysis,init,type:0
+#: rml:salary.structure:0
+msgid "Type"
+msgstr "类型"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "#"
+msgstr "#"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Miscelleanous"
+msgstr "杂项"
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Integrity Error !"
+msgstr "完整性错误！"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr "核实表"
+
+#. module: hr_payroll
+#: field:hr.employee,pan_no:0
+msgid "PAN No"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_button:wizard.employees.detail,init,report:0
+#: wizard_button:wizard.year.salary,init,report:0
+msgid "Print"
+msgstr "打印"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr "会计信息"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Contributions Configuration"
+msgstr "捐助设置"
+
+#. module: hr_payroll
+#: field:hr.payroll.register,grows:0
+#: field:hr.payslip,grows:0
+msgid "Gross Salary"
+msgstr "薪资总额"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Earnings"
+msgstr "总收益"
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Payment"
+msgstr "其它付款"
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Basic Salary - Leaves"
+msgstr "基本薪金 - 叶节点"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:payroll.analysis,init,type:0
+msgid "By Employee Function"
+msgstr "按员工职能"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr "员工薪酬"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.wizard,name:hr_payroll.wizard_print_year_salary
+msgid "Year Salary Detail"
+msgstr "年薪细节"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Fixed Amount"
+msgstr "固定金额"
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Verification"
+msgstr "等待确认"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr "明细"
+
+#. module: hr_payroll
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "无效的视图结构xml文件!"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr "支付薪酬"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Gross SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please defined the Partner in Home Address !!"
+msgstr "请定义业务伙伴主页地址!"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "For the month of"
+msgstr "这月"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr "工资单"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,deduction:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,deduction:0
+#: selection:hr.payslip.line,type:0
+msgid "Deduction"
+msgstr "扣除"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr "银行通知"
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Passport List"
+msgstr "护照"
+
+#. module: hr_payroll
+#: field:hr.payslip,payment_id:0
+msgid "Payment Entries"
+msgstr "付款记录"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "YTD"
+msgstr "年初至今"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,expanse_id:0
+msgid "Expense"
+msgstr "支出"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+msgid "Fided Value"
+msgstr "固定值"
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan Installment"
+msgstr "分期贷款"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Complete HR Checking"
+msgstr "完成人力资源检查"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr "谨启"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Allowances"
+msgstr "津贴"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Net Amount"
+msgstr "净金额"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payroll.advice,state:0
+#: field:hr.payroll.register,state:0
+#: field:hr.payslip,state:0
+msgid "State"
+msgstr "状态"
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Salary Structure:"
+msgstr "薪酬结构:"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
+msgid "Employees Salary Detail"
+msgstr "员工薪酬细节"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_employee_grade
+msgid "Function of the Employee"
+msgstr "这员工职能"
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Confirm Sheet"
+msgstr "确认表"
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Account Verification"
+msgstr "等待帐户确认"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Others:"
+msgstr "其它："
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.passport,contracts_ids:0
+msgid "Contracts"
+msgstr "合同"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Passport and Visa"
+msgstr "护照和visa"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employee Code"
+msgstr "员工代码"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: field:hr.payslip.line,amount_type:0
+#: rml:salary.structure:0
+msgid "Amount Type"
+msgstr "金额类型"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: field:hr.payslip.line,category_id:0
+#: rml:salary.structure:0
+msgid "Category"
+msgstr "分类"
+
+#. module: hr_payroll
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Total SAL"
+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
+#: field:hr.employee,hospital_id:0
+msgid "ESI Hospital"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0
+#: view:hr.payroll.register:0
+#: field:hr.payroll.register,line_ids:0
+msgid "Payslips"
+msgstr "工资单"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Earnings"
+msgstr "收入"
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Reject"
+msgstr "拒绝"
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
+msgid "All Passports"
+msgstr "所有护照"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "Employee Name"
+msgstr "员工姓名"
+
+#. module: hr_payroll
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr "薪酬帐号"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Percentage (%)"
+msgstr "百分比(%)"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,register_id:0
+#: view:hr.payroll.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
+#: model:ir.model,name:hr_payroll.model_hr_payroll_register
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
+msgid "Payroll Register"
+msgstr "工资单记录"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "For"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expanse Journal"
+msgstr "支出记录集合"
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_contract
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_contract
+msgid "Employee Contract"
+msgstr "员工合约"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,contribute:0
+msgid "Contribe by Company ?"
+msgstr "公司捐助?"
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Employee Function"
+msgstr "员工职能"
+
+#. module: hr_payroll
+#: field:hr.contract,working_days_per_week:0
+msgid "Working Days / Week"
+msgstr "工作天数/ 周"
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days:0
+msgid "Worked Day"
+msgstr "已工作天数"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Complete Accountant Checking"
+msgstr "完整的会计检查"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Title"
+msgstr "标题"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+msgid "On Attendance"
+msgstr "按出勤"
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
+msgid "Allowance/Deduction Heads"
+msgstr "津贴/ 扣减"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr "计算表"
+
+#. module: hr_payroll
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr "有效"
+
+#. module: hr_payroll
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr "员工帐号"
+
+#. module: hr_payroll
+#: rml:year.salary:0
+msgid "Yearly Salary Details"
+msgstr "年薪细节"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr "条件"
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for HR Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,pf_account:0
+msgid "PF Account"
+msgstr "公积金帐号"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Compute"
+msgstr "公司"
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr "付款明细"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: field:hr.payslip,deg_id:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Designation"
+msgstr "指定"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "HR Manager"
+msgstr "人力资源经理"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payslip,basic_before_leaves:0
+#: rml:payslip.pdf:0
+msgid "Basic Salary"
+msgstr "基本薪酬"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,code:0
+msgid "Categoty Code"
+msgstr "分类代码"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Salary Information"
+msgstr "薪酬信息"
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
+msgid "Allowance Deduction Categoty"
+msgstr "津贴扣减分类"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr "授权签字"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Allowance / Deduction Category"
+msgstr "津贴/ 扣减 分类"
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr "表草稿"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:hr.payroll.register,date:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Basic SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr "签证到期日期"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Phone No."
+msgstr "电话号码"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,include_in_salary:0
+msgid "Included in Salary ?"
+msgstr "包含在薪酬?"
+
+#. module: hr_payroll
+#: field:hr.expense.expense,category_id:0
+#: field:hr.holidays.status,head_id:0
+msgid "Payroll Head"
+msgstr "工资单头"
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr "银行通知"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,account_id:0
+#: rml:salary.structure:0
+msgid "General Account"
+msgstr "通用帐号"
+
+#. module: hr_payroll
+#: field:hr.holidays.status,code:0
+#: field:hr.payslip.line,code:0
+#: rml:salary.structure:0
+msgid "Code"
+msgstr "代码"
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
+#: rml:payroll.advice:0
+msgid "Payment Advice"
+msgstr "付款通知"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,to:0
+msgid "To"
+msgstr "到"
+
+#. module: hr_payroll
+#: wizard_button:payroll.analysis,init,process:0
+msgid "Process"
+msgstr "处理"
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan"
+msgstr "贷款"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,sequence:0
+msgid "Sequence"
+msgstr "序列"
+
+#. module: hr_payroll
+#: wizard_field:wizard.year.salary,init,salary_on:0
+msgid "Salary On"
+msgstr "薪酬在"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,number:0
+#: field:hr.payroll.register,number:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,number:0
+msgid "Number"
+msgstr "编号"
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Contract Detail:"
+msgstr "合约内容:"
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "General Information"
+msgstr "一般信息"
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr "付款明细"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.employee,line_ids:0
+#: view:hr.employee.grade:0
+#: field:hr.employee.grade,line_ids:0
+#: rml:salary.structure:0
+msgid "Salary Structure"
+msgstr "薪酬结构"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+#: wizard_button:payroll.analysis,init,end:0
+#: wizard_button:wizard.employees.detail,init,end:0
+#: wizard_button:wizard.year.salary,init,end:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount:0
+#: rml:salary.structure:0
+msgid "Amount / Percentage"
+msgstr "金额/ 百分比"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr "会计细节"
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Current Month Date"
+msgstr "本月日期"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Contract Duration"
+msgstr "合同有效期"
+
+#. module: hr_payroll
+#: wizard_view:payroll.analysis,init:0
+msgid "Process Form"
+msgstr "进程表"
+
+#. module: hr_payroll
+#: field:hr.passport,name:0
+msgid "Passport No"
+msgstr "护照No"
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Account Information"
+msgstr "会计信息"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Generalities"
+msgstr "概要"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "for period"
+msgstr "期间"
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "E-mail"
+msgstr "E-mail"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr "打印"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,line_ids:0
+msgid "Calculations"
+msgstr "计算"
+
+#. module: hr_payroll
+#: wizard_view:wizard.year.salary,init:0
+msgid "Salary Deposit Date Option?"
+msgstr "薪酬存款日期选项?"
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr "其它信息"
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr "动态计算"
+
+#. module: hr_payroll
+#: field:hr.employee.grade,function_id:0
+#: field:hr.payslip.line,function_id:0
+msgid "Function"
+msgstr "职能"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "PAN No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr "说明"
+
+#. module: hr_payroll
+#: field:hr.employee,pg_joining:0
+msgid "PF Join Date"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+msgid "Payroll"
+msgstr "工资单"
+
+#. module: hr_payroll
+#: wizard_view:wizard.employees.detail,init:0
+#: wizard_view:wizard.year.salary,init:0
+msgid "Year Salary"
+msgstr "年薪"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,name:0
+msgid "Categoty Name"
+msgstr "分类名"
+
+#. module: hr_payroll
+#: model:ir.actions.wizard,name:hr_payroll.wizard_payroll_analysis
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_payroll_analysis
+msgid "Create Analytic Structure"
+msgstr "创建辅助核算结构"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Address"
+msgstr "地址"
+
+#. module: hr_payroll
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expanse will be Paid"
+msgstr "选择薪酬和将要支付的支出的银行帐号"
+
+#. module: hr_payroll
+#: help:hr.employee,salary_account:0
+msgid "Expanse account when Salary Expanse will be recorded"
+msgstr "将被记录薪酬支出的支出帐号"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Notes"
+msgstr "备注"
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.payroll_configure
+msgid "Configure Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Advance"
+msgstr "预支"
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Special Allowances and Deductions For Employee:"
+msgstr "特别津贴和员工的扣除"
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,name:0
+#: field:hr.payroll.advice,name:0
+#: field:hr.payroll.register,name:0
+#: field:hr.payslip,name:0
+#: field:hr.payslip.line,name:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "Name"
+msgstr "名称"
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leaved Deduction"
+msgstr "休假扣除"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Statutory Information"
+msgstr "法定信息"
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
+msgid "Employee Functions"
+msgstr "员工职能"
+
+#. module: hr_payroll
+#: wizard_field:wizard.employees.detail,init,employee_ids:0
+#: wizard_field:wizard.year.salary,init,employee_ids:0
+msgid "Employees"
+msgstr "员工"
+
+#. module: hr_payroll
+#: field:hr.employee,property_bank_account:0
+#: rml:payroll.advice:0
+msgid "Bank Account"
+msgstr "银行帐号"
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr "银行帐号 A/C"
+
+#. module: hr_payroll
+#: wizard_field:wizard.employees.detail,init,fiscalyear_id:0
+#: wizard_field:wizard.year.salary,init,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr "会计年度"
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Contract"
+msgstr "合约"
+
+#. module: hr_payroll
+#: selection:payroll.analysis,init,type:0
+msgid "By Allownce / Deduction"
+msgstr "按津贴/ 扣减"
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Payroll Configurtion"
+msgstr "工资单设置"
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+msgstr "护照签发日期"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,allounce:0
+#: field:hr.payslip,allounce:0
+#: selection:hr.payslip.line,type:0
+msgid "Allowance"
+msgstr "津贴"
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr "没有叶节点"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Bank Details"
+msgstr "银行详情"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Deductions"
+msgstr "扣除"
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslip"
+msgstr "员工工资单"
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr "信的内容"
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "By Sal"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Net SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr "银行付款通知"
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
+msgid "Print Salary Structure"
+msgstr "打印薪酬结构"
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Deductions"
+msgstr "扣除合计"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payroll.advice:0
+#: rml:year.salary:0
+msgid "Total"
+msgstr "合计"
diff --git a/addons/hr_payroll/test/payment_advice.yml b/addons/hr_payroll/test/payment_advice.yml
index de86d8c27be..a2a9c3d5dbe 100644
--- a/addons/hr_payroll/test/payment_advice.yml
+++ b/addons/hr_payroll/test/payment_advice.yml
@@ -2,7 +2,7 @@
   I test the 'Payment Advice' in order to check the hr_payroll in OpenERP
 -
   I create a new employee “Richie”
-- 
+-
   !record {model: hr.employee, id: hr_employee_richie0}:
     address_home_id: base.res_partner_address_1
     address_id: base.res_partner_address_9
@@ -27,8 +27,8 @@
     salary_account: account.a_recv
     vehicle_distance: 0.0
 -
-  Then I create a new payment advice record  
--  
+  I create a new payment advice record
+-
   !record {model: hr.payroll.advice, id: hr_payroll_advice_advice0}:
     account_id: account.cash
     line_ids:
@@ -38,15 +38,15 @@
         flag: C
         name: Axis Bank
     name: advice1
-- 
-  In order to confirm a sheet I click on "Confirm Sheet" button
-- 
+-
+  I confirmed the sheet by click on "Confirm Sheet" button.
+-
   !python {model: hr.payroll.advice}: |
     self.confirm_sheet(cr, uid, [ref("hr_payroll_advice_advice0")], {"lang": "en_US",
       "active_model": "ir.ui.menu", "active_ids": [ref("hr_payroll.hr_menu_payment_advice")],
       "tz": False, "active_id": ref("hr_payroll.hr_menu_payment_advice")})
 -
- I check that a state has transferred from draft to confirm
+ I check that a state is "Confirm"
 -
   !python {model: hr.payroll.advice}: |
     from tools.translate import _
diff --git a/addons/hr_payroll/test/payroll_register.yml b/addons/hr_payroll/test/payroll_register.yml
index 317ad40ac32..f5772602db4 100644
--- a/addons/hr_payroll/test/payroll_register.yml
+++ b/addons/hr_payroll/test/payroll_register.yml
@@ -2,7 +2,7 @@
   I test the 'Payroll Register' in order to check the hr_payroll in OpenERP
 -
   I create a new employee “Keith”
-- 
+-
   !record {model: hr.employee, id: hr_employee_keith0}:
     address_home_id: base.res_partner_address_3
     address_id: base.res_partner_address_9
@@ -27,7 +27,7 @@
     salary_account: account.a_recv
     vehicle_distance: 0.0
 -
-  I create a payroll register record
+  I create a payroll register record.
 -
   !record {model: hr.payroll.register, id: hr_payroll_register_payroll0}:
     bank_journal_id: account.bank_journal
@@ -38,8 +38,8 @@
         bank_journal_id: account.bank_journal
         journal_id: account.expenses_journal
     name: payroll1
-- 
-  I click on Compute button
+-
+  I click on Compute button.
 -
   !python {model: hr.payroll.register}: |
     self.compute_sheet(cr, uid, [ref("hr_payroll_register_payroll0")], {"lang": "en_US",
@@ -47,7 +47,7 @@
       [ref("hr_payroll.hr_menu_payroll_register")], "section_id": False, "active_id":
       ref("hr_payroll.hr_menu_payroll_register"), })
 -
-  Then I click on Verify Sheet button
+  Then I click on Verify Sheet button.
 -
   !python {model: hr.payroll.register}: |
     self.verify_sheet(cr, uid, [ref("hr_payroll_register_payroll0")], {"lang": "en_US",
@@ -60,4 +60,4 @@
   !python {model: hr.payroll.register}: |
     from tools.translate import _
     reg_brw=self.browse(cr, uid, ref("hr_payroll_register_payroll0"))
-    assert(reg_brw.state == 'hr_check'), _('State not changed!') 
+    assert(reg_brw.state == 'hr_check'), _('State not changed!')
diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index 1ecab075da0..f1c860f8edd 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -1,8 +1,16 @@
 -
   I test the 'Payment Advice' in order to check the hr_payroll in OpenERP
+-
+  I Create a bank record
+-
+  !record {model: res.partner.bank, id: res_partner_bank_0}:
+    acc_number: '987654321'
+    partner_id: base.res_partner_desertic_hispafuentes
+    sequence: 0.0
+    state: bank
 -
   I create a new employee “Richard”
-- 
+-
   !record {model: hr.employee, id: hr_employee_richard0}:
     address_home_id: base.res_partner_address_2
     address_id: base.res_partner_address_9
@@ -24,10 +32,11 @@
     name: Richard
     pg_joining: '2009-12-01'
     property_bank_account: account.cash
+    bank_account_id: res_partner_bank_0
     salary_account: account.a_recv
     vehicle_distance: 0.0
 -
-  I create a new payroll structure for software developer 
+  I create a new payroll structure for software developer
 -
   !record {model: hr.payroll.structure, id: hr_payroll_structure_softwaredeveloper0}:
     code: SD
@@ -75,58 +84,60 @@
     name: Software Developer
 -
   I create a employee payslip record
-- 
+-
   !record {model: hr.payslip, id: hr_payslip_0}:
     bank_journal_id: account.bank_journal
     employee_id: hr_payroll.hr_employee_richard0
     journal_id: account.expenses_journal
-- 
+-
   I click on 'Compute Sheet' button
-- 
+-
   !workflow {model: hr.payslip, action: compute_sheet, ref: hr_payslip_0}
-- 
+-
+  just to test
+-
   !python {model: hr.payslip}: |
     self.compute_sheet(cr, uid, [ref("hr_payslip_0")], {"lang": "en_US", "tz": False,
       "active_model": "ir.ui.menu", "department_id": False, "active_ids": [ref("hr_payroll.menu_department_tree")],
       "section_id": False, "active_id": ref("hr_payroll.menu_department_tree"),
       })
 -
-  I check that an order which was in the "New Slip" state has transit to "Wating for Verification" state
+  I check that the order is now in "Waiting for Verification" state
 -
   !python {model: hr.payslip}: |
     from tools.translate import _
     payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
-    assert(payslip_brw.state == 'draft'), _('State not changed!') 
+    assert(payslip_brw.state == 'draft'), _('State not changed!')
+-
+  I click on Verify Sheet button.
 -
-  Then I click on Verify Sheet button
-- 
   !workflow {model: hr.payslip, action: verify_sheet, ref: hr_payslip_0}
 -
-  I check that an order which was in the "Wating for Verification" state has transit to "Wating for HR Verification" state
+  I check that the order is in the "Waiting for HR Verification" state
 -
   !python {model: hr.payslip}: |
     from tools.translate import _
     payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
-    assert(payslip_brw.state == 'hr_check'), _('State not changed!') 
+    assert(payslip_brw.state == 'hr_check'), _('State not changed!')
 -
-  Then I click on Complete HR Checking button
+  I click on Complete HR Checking button.
 -
   !workflow {model: hr.payslip, action: final_verify_sheet, ref: hr_payslip_0}
 -
- I check that an order which was in the "'Wating for HR Verification'" state has transit to "Confirm Sheet" state
+  I check that the order is in "Confirm Sheet" state.
 -
   !python {model: hr.payslip}: |
     from tools.translate import _
     payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
-    assert(payslip_brw.state == 'confirm'), _('State not changed!') 
--  
-  Then I click on Pay Salary button
-- 
+    assert(payslip_brw.state == 'confirm'), _('State not changed!')
+-
+  I click on Pay Salary button
+-
   !workflow {model: hr.payslip, action: process_sheet, ref: hr_payslip_0}
 -
-  I check that an order which was in the "Confirm Sheet" state has transit to "Paid Salary" state
+  I check that the order is in "Paid Salary" state.
 -
   !python {model: hr.payslip}: |
     from tools.translate import _
     payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
-    assert(payslip_brw.state == 'done'), _('State not changed!') 
+    assert(payslip_brw.state == 'done'), _('State not changed!')
diff --git a/addons/hr_payroll/wizard/hr_payroll_create_analytic.py b/addons/hr_payroll/wizard/hr_payroll_create_analytic.py
index cded95390f4..45c2d2c495e 100644
--- a/addons/hr_payroll/wizard/hr_payroll_create_analytic.py
+++ b/addons/hr_payroll/wizard/hr_payroll_create_analytic.py
@@ -32,37 +32,38 @@ class hr_payroll_create_analytic(osv.osv_memory):
        }
 
    def do_duplicate(self, cr, uid, ids, context=None):
-
-        account_pool =self.pool.get('account.analytic.account')
+        account_pool = self.pool.get('account.analytic.account')
         func_pool = self.pool.get('hr.employee.grade')
         ad_pool = self.pool.get('hr.allounce.deduction.categoty')
-        data = self.read(cr,uid,ids)[0]
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, context=context)[0]
         tpy = data['type']
         company = data['company_id']
 
-        function_ids = func_pool.search(cr, uid, [])
-        ad_ids = ad_pool.search(cr, uid, [])
+        function_ids = func_pool.search(cr, uid, [], context=context)
+        ad_ids = ad_pool.search(cr, uid, [], context=context)
 
         if tpy == 'bydeg':
-            for function in func_pool.browse(cr, uid, function_ids):
+            for function in func_pool.browse(cr, uid, function_ids, context=context):
                 res = {
                     'name':function.name,
                     'company_id':company
                 }
-                fid = account_pool.create(cr, uid, res)
+                fid = account_pool.create(cr, uid, res, context=context)
                 res = {
                     'name':'Basic Salary',
                     'company_id':company,
                     'parent_id': fid
                 }
-                account_pool.create(cr, uid, res)
-                for ad in ad_pool.browse(cr, uid, ad_ids):
+                account_pool.create(cr, uid, res, context=context)
+                for ad in ad_pool.browse(cr, uid, ad_ids, context=context):
                     res = {
                         'name':ad.name,
                         'company_id':company,
                         'parent_id': fid
                     }
-                    account_pool.create(cr, uid, res)
+                    account_pool.create(cr, uid, res, context=context)
 
 
 
@@ -71,28 +72,28 @@ class hr_payroll_create_analytic(osv.osv_memory):
                 'name':'Basic Salary',
                 'company_id':company
             }
-            adid = account_pool.create(cr, uid, res)
-            for function in func_pool.browse(cr, uid, function_ids):
+            adid = account_pool.create(cr, uid, res, context=context)
+            for function in func_pool.browse(cr, uid, function_ids, context=context):
                 res = {
                     'name':function.name,
                     'company_id':company,
                     'parent_id': adid
                 }
-                account_pool.create(cr, uid, res)
+                account_pool.create(cr, uid, res, context=context)
 
-            for ad in ad_pool.browse(cr, uid, ad_ids):
+            for ad in ad_pool.browse(cr, uid, ad_ids, context=context):
                 res = {
                     'name':ad.name,
                     'company_id':company,
                 }
-                adid = account_pool.create(cr, uid, res)
-                for function in func_pool.browse(cr, uid, function_ids):
+                adid = account_pool.create(cr, uid, res, context=context)
+                for function in func_pool.browse(cr, uid, function_ids, context=context):
                     res = {
                         'name':function.name,
                         'company_id':company,
                         'parent_id': adid
                     }
-                    account_pool.create(cr, uid, res)
+                    account_pool.create(cr, uid, res, context=context)
 
         return {}
 hr_payroll_create_analytic()
diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
index 7c14aa82dd5..c2d0e3c4116 100755
--- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
+++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
@@ -31,8 +31,10 @@ class hr_payroll_employees_detail(osv.osv_memory):
         'employee_ids': fields.many2many('hr.employee', 'payroll_emp_rel','payroll_id','emp_id', 'Employees',required=True),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True)
        }
-   def _get_fiscalyear(self, cr, uid, ids, context={}):
-        fiscal_ids=self.pool.get('account.fiscalyear').search(cr,uid,[])
+   def _get_fiscalyear(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        fiscal_ids = self.pool.get('account.fiscalyear').search(cr,uid,[], context=context)
         if fiscal_ids:
             return fiscal_ids[0]
         return False
@@ -50,7 +52,8 @@ class hr_payroll_employees_detail(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, ['employee_ids', 'fiscalyear_id'], context=context)
@@ -60,7 +63,6 @@ class hr_payroll_employees_detail(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'employees.salary',
             'datas': datas,
-            'nodestroy':True,
        }
 
 hr_payroll_employees_detail()
diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
index e58cdc8fc1b..a7091540894 100755
--- a/addons/hr_payroll/wizard/hr_payroll_year_salary.py
+++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
@@ -33,7 +33,9 @@ class hr_payroll_year_salary(osv.osv_memory):
        }
 
    def _get_fiscalyear(self, cr, uid, ids, context=None):
-        fiscal_ids=self.pool.get('account.fiscalyear').search(cr,uid,[],context=context)
+        if context is None:
+            context = {}
+        fiscal_ids=self.pool.get('account.fiscalyear').search(cr, uid, [], context=context)
         if fiscal_ids:
             return fiscal_ids[0]
         return False
@@ -52,7 +54,8 @@ class hr_payroll_year_salary(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, ['employee_ids', 'fiscalyear_id','salary_on'], context=context)
@@ -62,7 +65,6 @@ class hr_payroll_year_salary(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'year.salary',
             'datas': datas,
-            'nodestroy':True,
        }
 
 hr_payroll_year_salary()
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 33c17518ab9..7bb1c3027e1 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -1,7 +1,7 @@
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    d$
 #
@@ -28,7 +28,7 @@
     * Payment Encoding
     * Comany Contribution Managemet
     """,
-    'author':'Tiny/Axelor',
+    'author':'OpenERP SA/Axelor',
     'website':'http://www.openerp.com',
     'depends': [
         'hr_payroll',
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 063090cbe83..f07a0493b4f 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -1,7 +1,7 @@
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    d$
 #
@@ -22,14 +22,13 @@
 
 import time
 import netsvc
-from osv import osv
-from osv import fields
+from datetime import date, datetime, timedelta
+
+from osv import fields, osv
 from tools import config
 from tools.translate import _
 
-from datetime import date
-from datetime import datetime
-from datetime import timedelta
+
 
 def prev_bounds(cdate=False):
     when = date.fromtimestamp(time.mktime(time.strptime(cdate,"%Y-%m-%d")))
@@ -49,14 +48,14 @@ class hr_payslip(osv.osv):
     '''
     _inherit = 'hr.payslip'
     _description = 'Pay Slip'
-    
+
     _columns = {
         'move_ids':fields.one2many('hr.payslip.account.move', 'slip_id', 'Accounting vouchers', required=False),
         'move_line_ids':fields.many2many('account.move.line', 'payslip_lines_rel', 'slip_id', 'line_id', 'Accounting Lines', readonly=True),
         'move_payment_ids':fields.many2many('account.move.line', 'payslip_payment_rel', 'slip_id', 'payment_id', 'Payment Lines', readonly=True),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
     }
-    
+
     def create_voucher(self, cr, uid, ids, name, voucher, sequence=5):
         slip_move = self.pool.get('hr.payslip.account.move')
         for slip in ids:
@@ -67,78 +66,83 @@ class hr_payslip(osv.osv):
                 'name':name
             }
             slip_move.create(cr, uid, res)
-    
-    def cancel_sheet(self, cr, uid, ids, context={}):
+
+    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):
+        for slip in self.browse(cr, uid, ids, context=context):
             for line in slip.move_ids:
                 move_ids.append(line.id)
                 if line.move_id:
                     if line.move_id.state == 'posted':
                         move_pool.button_cancel(cr, uid [line.move_id.id], context)
-                    move_pool.unlink(cr, uid, [line.move_id.id])
-        
-        slip_move.unlink(cr, uid, move_ids)
-        self.write(cr, uid, ids, {'state':'cancel'})
+                    move_pool.unlink(cr, uid, [line.move_id.id], context=context)
+
+        slip_move.unlink(cr, uid, move_ids, context=context)
+        self.write(cr, uid, ids, {'state':'cancel'}, context=context)
         return True
-    
-    def process_sheet(self, cr, uid, ids, context={}):
+
+    def process_sheet(self, cr, uid, ids, context=None):
         move_pool = self.pool.get('account.move')
         movel_pool = self.pool.get('account.move.line')
         invoice_pool = self.pool.get('account.invoice')
-        
-        for slip in self.browse(cr,uid,ids):    
+        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 = []
             partner = False
             partner_id = False
             exp_ids = []
-            
+
             partner = slip.employee_id.bank_account_id.partner_id
             partner_id = partner.id
-            
-            fiscal_year_ids = self.pool.get('account.fiscalyear').search(cr, uid, [])
+
+            fiscal_year_ids = fiscalyear_pool.search(cr, uid, [], context=context)
             if not fiscal_year_ids:
                 raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
-            fiscal_year_objs = self.pool.get('account.fiscalyear').read(cr, uid, fiscal_year_ids, ['date_start','date_stop'])
+            fiscal_year_objs = fiscalyear_pool.read(cr, uid, fiscal_year_ids, ['date_start','date_stop'], context=context)
             year_exist = False
             for fiscal_year in fiscal_year_objs:
                 if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
                     year_exist = True
             if not year_exist:
                 raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s'%slip.date))
-            search_period = self.pool.get('account.period').search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)])
-            if not search_period:
+            search_periods = period_pool.search(cr, uid, [('date_start','<=',slip.date),('date_stop','>=',slip.date)], context=context)
+            if not search_periods:
                 raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s'%slip.date))
-            period_id = search_period[0]
+            period_id = search_periods[0]
             name = 'Payment of Salary to %s' % (slip.employee_id.name)
             move = {
                 'journal_id': slip.bank_journal_id.id,
-                'period_id': period_id, 
+                'period_id': period_id,
                 'date': slip.date,
                 'type':'bank_pay_voucher',
                 'ref':slip.number,
                 'narration': name
             }
-            move_id = move_pool.create(cr, uid, move)
+            move_id = move_pool.create(cr, uid, move, context=context)
             self.create_voucher(cr, uid, [slip.id], name, move_id)
-            
+
             name = "To %s account" % (slip.employee_id.name)
             ded_rec = {
                 'move_id':move_id,
                 'name': name,
                 #'partner_id': partner_id,
-                'date': slip.date, 
-                'account_id': slip.employee_id.property_bank_account.id, 
+                'date': slip.date,
+                'account_id': slip.employee_id.property_bank_account.id,
                 'debit': 0.0,
                 'credit' : slip.total_pay,
                 'journal_id' : slip.journal_id.id,
                 'period_id' :period_id,
                 'ref':slip.number
             }
-            line_ids += [movel_pool.create(cr, uid, ded_rec)]
+            line_ids += [movel_pool.create(cr, uid, ded_rec, context=context)]
             name = "By %s account" % (slip.employee_id.property_bank_account.name)
             cre_rec = {
                 'move_id':move_id,
@@ -152,8 +156,8 @@ class hr_payslip(osv.osv):
                 'period_id' :period_id,
                 'ref':slip.number
             }
-            line_ids += [movel_pool.create(cr, uid, cre_rec)]
-            
+            line_ids += [movel_pool.create(cr, uid, cre_rec, context=context)]
+
             other_pay = slip.other_pay
             #Process all Reambuse Entries
             for line in slip.line_ids:
@@ -169,40 +173,40 @@ class hr_payslip(osv.osv):
                     invoice_pool.pay_and_reconcile(cr, uid, invids, amount, acc_id, period_id, journal_id, False, period_id, False, context, name)
                     other_pay -= amount
                     #TODO: link this account entries to the Payment Lines also Expanse Entries to Account Lines
-                    l_ids = movel_pool.search(cr, uid, [('name','=',name)])
+                    l_ids = movel_pool.search(cr, uid, [('name','=',name)], context=context)
                     line_ids += l_ids
-                    
-                    l_ids = movel_pool.search(cr, uid, [('invoice','=',line.expanse_id.invoice_id.id)])
+
+                    l_ids = movel_pool.search(cr, uid, [('invoice','=',line.expanse_id.invoice_id.id)], context=context)
                     exp_ids += l_ids
-            
+
             #Process for Other payment if any
             other_move_id = False
             if slip.other_pay > 0:
                 narration = 'Payment of Other Payeble amounts to %s' % (slip.employee_id.name)
                 move = {
                     'journal_id': slip.bank_journal_id.id,
-                    'period_id': period_id, 
+                    'period_id': period_id,
                     'date': slip.date,
                     'type':'bank_pay_voucher',
                     'ref':slip.number,
                     'narration': narration
                 }
-                other_move_id = move_pool.create(cr, uid, move)
+                other_move_id = move_pool.create(cr, uid, move, context=context)
                 self.create_voucher(cr, uid, [slip.id], narration, move_id)
-                
+
                 name = "To %s account" % (slip.employee_id.name)
                 ded_rec = {
                     'move_id':other_move_id,
                     'name':name,
-                    'date':slip.date, 
-                    'account_id':slip.employee_id.property_bank_account.id, 
+                    'date':slip.date,
+                    'account_id':slip.employee_id.property_bank_account.id,
                     'debit': 0.0,
                     'credit': other_pay,
                     'journal_id':slip.journal_id.id,
                     'period_id':period_id,
                     'ref':slip.number
                 }
-                line_ids += [movel_pool.create(cr, uid, ded_rec)]
+                line_ids += [movel_pool.create(cr, uid, ded_rec, context=context)]
                 name = "By %s account" % (slip.employee_id.property_bank_account.name)
                 cre_rec = {
                     'move_id':other_move_id,
@@ -216,85 +220,94 @@ class hr_payslip(osv.osv):
                     'period_id':period_id,
                     'ref':slip.number
                 }
-                line_ids += [movel_pool.create(cr, uid, cre_rec)]
-            
+                line_ids += [movel_pool.create(cr, uid, cre_rec, context=context)]
+
             rec = {
                 'state':'done',
                 'move_payment_ids':[(6, 0, line_ids)],
                 'paid':True
             }
-            self.write(cr, uid, [slip.id], rec)
+            self.write(cr, uid, [slip.id], rec, context=context)
             for exp_id in exp_ids:
-                self.write(cr, uid, [slip.id], {'move_line_ids':[(4, exp_id)]})
-            
+                self.write(cr, uid, [slip.id], {'move_line_ids':[(4, exp_id)]}, context=context)
+
         return True
-    
-    def account_check_sheet(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'accont_check'})
+
+    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={}):
-        self.write(cr, uid, ids, {'state':'hr_check'})
+
+    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 verify_sheet(self, cr, uid, ids, context={}):
-        
+
+    def verify_sheet(self, cr, uid, ids, context=None):
         move_pool = self.pool.get('account.move')
         movel_pool = self.pool.get('account.move.line')
         exp_pool = self.pool.get('hr.expense.expense')
-        
-        for slip in self.browse(cr,uid,ids):
+        fiscalyear_pool = self.pool.get('account.fiscalyear')
+        period_pool = self.pool.get('account.period')
+        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
-            
+
             line_ids = []
             partner = False
             partner_id = False
-            
+
             if not slip.employee_id.bank_account_id:
                 raise osv.except_osv(_('Integrity Error !'), _('Please defined bank account for %s !' % (slip.employee_id.name)))
-            
+
             if not slip.employee_id.bank_account_id.partner_id:
                 raise osv.except_osv(_('Integrity Error !'), _('Please defined partner in bank account for %s !' % (slip.employee_id.name)))
-            
+
             partner = slip.employee_id.bank_account_id.partner_id
             partner_id = slip.employee_id.bank_account_id.partner_id.id
-            
+
             period_id = False
-            
+
             if slip.period_id:
                 period_id = slip.period_id.id
             else:
-                fiscal_year_ids = self.pool.get('account.fiscalyear').search(cr, uid, [])
+                fiscal_year_ids = fiscalyear_pool.search(cr, uid, [], context=context)
                 if not fiscal_year_ids:
                     raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
-                fiscal_year_objs = self.pool.get('account.fiscalyear').read(cr, uid, fiscal_year_ids, ['date_start','date_stop'])
+                fiscal_year_objs = fiscalyear_pool.read(cr, uid, fiscal_year_ids, ['date_start','date_stop'], context=context)
                 year_exist = False
                 for fiscal_year in fiscal_year_objs:
                     if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
                         year_exist = True
                 if not year_exist:
                     raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s'%slip.date))
-                search_period = self.pool.get('account.period').search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)])
-                if not search_period:
+                search_periods = period_pool.search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)], context=context)
+                if not search_periods:
                     raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s'%slip.date))
-                period_id = search_period[0]
-            
+                period_id = search_periods[0]
+
             move = {
-                #'name': slip.name, 
+                #'name': slip.name,
                 'journal_id': slip.journal_id.id,
-                'period_id': period_id, 
+                'period_id': period_id,
                 'date': slip.date,
                 'ref':slip.number,
                 'narration': slip.name
             }
-            move_id = move_pool.create(cr, uid, move)
+            move_id = move_pool.create(cr, uid, move, context=context)
             self.create_voucher(cr, uid, [slip.id], slip.name, move_id)
-            
+
             line = {
                 'move_id':move_id,
                 'name': "By Basic Salary / " + slip.employee_id.name,
                 'date': slip.date,
-                'account_id': slip.employee_id.salary_account.id, 
+                'account_id': slip.employee_id.salary_account.id,
                 'debit': slip.basic,
                 'credit': 0.0,
                 'quantity':slip.working_days,
@@ -303,20 +316,20 @@ class hr_payslip(osv.osv):
                 'analytic_account_id': False,
                 'ref':slip.number
             }
-            
+
             #Setting Analysis Account for Basic Salary
             if slip.employee_id.analytic_account:
                 line['analytic_account_id'] = slip.employee_id.analytic_account.id
-            
-            move_line_id = movel_pool.create(cr, uid, line)
+
+            move_line_id = movel_pool.create(cr, uid, line, context=context)
             line_ids += [move_line_id]
-            
+
             line = {
                 'move_id':move_id,
                 'name': "To Basic Paysble Salary / " + slip.employee_id.name,
                 'partner_id': partner_id,
-                'date': slip.date, 
-                'account_id': slip.employee_id.employee_account.id, 
+                'date': slip.date,
+                'account_id': slip.employee_id.employee_account.id,
                 'debit': 0.0,
                 'quantity':slip.working_days,
                 'credit': slip.basic,
@@ -324,20 +337,20 @@ class hr_payslip(osv.osv):
                 'period_id': period_id,
                 'ref':slip.number
             }
-            line_ids += [movel_pool.create(cr, uid, line)]
-            
+            line_ids += [movel_pool.create(cr, uid, line, context=context)]
+
             for line in slip.line_ids:
                 name = "[%s] - %s / %s" % (line.code, line.name, slip.employee_id.name)
                 amount = line.total
-                
+
                 if line.type == 'leaves':
                     continue
-                
+
                 rec = {
                     'move_id':move_id,
                     'name': name,
-                    'date': slip.date, 
-                    'account_id': line.account_id.id, 
+                    'date': slip.date,
+                    'account_id': line.account_id.id,
                     'debit': 0.0,
                     'credit' : 0.0,
                     'journal_id' : slip.journal_id.id,
@@ -346,13 +359,13 @@ class hr_payslip(osv.osv):
                     'ref':slip.number,
                     'quantity':1
                 }
-                
+
                 #Setting Analysis Account for Salary Slip Lines
                 if line.analytic_account_id:
                     rec['analytic_account_id'] = line.analytic_account_id.id
-                else: 
+                else:
                     rec['analytic_account_id'] = slip.deg_id.account_id.id
-                    
+
                 if line.type == 'allowance' or line.type == 'otherpay':
                     rec['debit'] = amount
                     if not partner.property_account_payable:
@@ -361,8 +374,8 @@ class hr_payslip(osv.osv):
                         'move_id':move_id,
                         'name': name,
                         'partner_id': partner_id,
-                        'date': slip.date, 
-                        'account_id': partner.property_account_payable.id, 
+                        'date': slip.date,
+                        'account_id': partner.property_account_payable.id,
                         'debit': 0.0,
                         'quantity':1,
                         'credit' : amount,
@@ -370,7 +383,7 @@ class hr_payslip(osv.osv):
                         'period_id' :period_id,
                         'ref':slip.number
                     }
-                    line_ids += [movel_pool.create(cr, uid, ded_rec)]
+                    line_ids += [movel_pool.create(cr, uid, ded_rec, context=context)]
                 elif line.type == 'deduction' or line.type == 'otherdeduct':
                     if not partner.property_account_receivable:
                         raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Receivable Account!!'))
@@ -380,24 +393,24 @@ class hr_payslip(osv.osv):
                         'move_id':move_id,
                         'name': name,
                         'partner_id': partner_id,
-                        'date': slip.date, 
+                        'date': slip.date,
                         'quantity':1,
-                        'account_id': partner.property_account_receivable.id, 
+                        'account_id': partner.property_account_receivable.id,
                         'debit': amount,
                         'credit' : 0.0,
                         'journal_id' : slip.journal_id.id,
                         'period_id' :period_id,
                         'ref':slip.number
                     }
-                    line_ids += [movel_pool.create(cr, uid, ded_rec)]
-                
-                line_ids += [movel_pool.create(cr, uid, rec)]
-                
+                    line_ids += [movel_pool.create(cr, uid, ded_rec, context=context)]
+
+                line_ids += [movel_pool.create(cr, uid, rec, context=context)]
+
                 for contrub in line.category_id.contribute_ids:
                     print contrib.name, contrub.code, contrub.amount_type, contrib.contribute_per, line.total
-                    
-                
-                
+
+
+
 #                if line.company_contrib > 0:
 #                    company_contrib = line.company_contrib
 ##                    if line.category_id.amount_type == 'per':
@@ -405,9 +418,9 @@ class hr_payslip(osv.osv):
 
 #                    narration = """Company Contribution of %s Encode same as a Company Expanse @ %s""" % (line.name, company_contrib)
 #                    move = {
-#                        #'name': slip.name, 
+#                        #'name': slip.name,
 #                        'journal_id': slip.journal_id.id,
-#                        'period_id': period_id, 
+#                        'period_id': period_id,
 #                        'date': slip.date,
 #                        'ref':slip.number,
 #                        'narration': narration
@@ -415,11 +428,11 @@ class hr_payslip(osv.osv):
 #                    company_contrib_move_id = move_pool.create(cr, uid, move)
 #                    name = "[%s] - %s / %s - Company Contribution" % (line.code, line.name, slip.employee_id.name)
 #                    self.create_voucher(cr, uid, [slip.id], name, company_contrib_move_id)
-#                    
+#
 #                    ded_deb = {
 #                        'move_id':company_contrib_move_id,
 #                        'name': name,
-#                        'date': slip.date, 
+#                        'date': slip.date,
 #                        'quantity':1,
 #                        'account_id': line.category_id.account_id.id,
 #                        'debit': company_contrib,
@@ -432,7 +445,7 @@ class hr_payslip(osv.osv):
 #                    ded_cre = {
 #                        'move_id':company_contrib_move_id,
 #                        'name': name,
-#                        'date': slip.date, 
+#                        'date': slip.date,
 #                        'quantity':1,
 #                        'account_id': line.category_id.register_id.account_id.id,
 #                        'debit': 0.0,
@@ -442,26 +455,26 @@ class hr_payslip(osv.osv):
 #                        'ref':slip.number
 #                    }
 #                    line_ids += [movel_pool.create(cr, uid, ded_cre)]
-#                    
+#
 #                    if line.category_id.include_in_salary:
 #                        narration = """Company Contribution of %s Deducted from Employee %s""" % (line.name, company_contrib)
 #                        move = {
-#                            #'name': slip.name, 
+#                            #'name': slip.name,
 #                            'journal_id': slip.journal_id.id,
-#                            'period_id': period_id, 
+#                            'period_id': period_id,
 #                            'date': slip.date,
 #                            'ref':slip.number,
 #                            'narration': narration
 #                        }
 #                        include_in_salary_move_id = move_pool.create(cr, uid, move)
 #                        self.create_voucher(cr, uid, [slip.id], narration, include_in_salary_move_id)
-#                        
+#
 #                        total_deduct += company_contrib
 #                        ded_deb = {
 #                            'move_id':include_in_salary_move_id,
 #                            'name': name,
 #                            'partner_id': partner_id,
-#                            'date': slip.date, 
+#                            'date': slip.date,
 #                            'quantity':1,
 #                            'account_id': partner.property_account_receivable.id,
 #                            'debit': company_contrib,
@@ -474,7 +487,7 @@ class hr_payslip(osv.osv):
 #                        ded_cre = {
 #                            'move_id':include_in_salary_move_id,
 #                            'name': name,
-#                            'date': slip.date, 
+#                            'date': slip.date,
 #                            'quantity':1,
 #                            'account_id': line.category_id.account_id.id,
 #                            'debit': 0.0,
@@ -497,14 +510,14 @@ class hr_payslip(osv.osv):
 #                    }
 #                    if line.category_id.contribute:
 #                        ctr['comp_deduction'] = amount
-#                    
+#
 #                    company = 0.0
 #                    employee = 0.0
 #                    if line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'per':
 #                        new_amount = (amount * (line.category_id.contribute_per / (1+line.category_id.contribute_per)))
 #                        company = new_amount
 #                        employee = amount - company
-#                    
+#
 #                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
 #                        company = line.category_id.contribute_per
 #                        employee = amount - company
@@ -512,11 +525,11 @@ class hr_payslip(osv.osv):
 #                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'func':
 #                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
 #                        employee = amount
-#                    
+#
 #                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'per':
 #                        company = amount * line.category_id.contribute_per
 #                        employee = amount
-#                    
+#
 #                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
 #                        company = line.category_id.contribute_per
 #                        employee = amount
@@ -524,10 +537,10 @@ class hr_payslip(osv.osv):
 #                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'func':
 #                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
 #                        employee = amount
-#                        
+#
 #                    ctr['emp_deduction'] = employee
 #                    ctr['comp_deduction'] = company
-#                        
+#
 #                    self.pool.get('hr.contibution.register.line').create(cr, uid, ctr)
 
             adj_move_id = False
@@ -539,16 +552,16 @@ class hr_payslip(osv.osv):
                     'ref':slip.number,
                     'narration': 'Adjustment : %s' % (slip.name)
                 }
-                adj_move_id = move_pool.create(cr, uid, move)
+                adj_move_id = move_pool.create(cr, uid, move, context=context)
                 name = "Adjustment Entry - %s" % (slip.employee_id.name)
                 self.create_voucher(cr, uid, [slip.id], name, adj_move_id)
-                
+
                 ded_rec = {
                     'move_id':adj_move_id,
                     'name': name,
                     'partner_id': partner_id,
-                    'date': slip.date, 
-                    'account_id': partner.property_account_receivable.id, 
+                    'date': slip.date,
+                    'account_id': partner.property_account_receivable.id,
                     'debit': 0.0,
                     'quantity':1,
                     'credit' : total_deduct,
@@ -556,13 +569,13 @@ class hr_payslip(osv.osv):
                     'period_id' :period_id,
                     'ref':slip.number
                 }
-                line_ids += [movel_pool.create(cr, uid, ded_rec)]
+                line_ids += [movel_pool.create(cr, uid, ded_rec, context=context)]
                 cre_rec = {
                     'move_id':adj_move_id,
                     'name': name,
                     'partner_id': partner_id,
                     'date': slip.date,
-                    'account_id': partner.property_account_payable.id, 
+                    'account_id': partner.property_account_payable.id,
                     'debit': total_deduct,
                     'quantity':1,
                     'credit' : 0.0,
@@ -570,7 +583,7 @@ class hr_payslip(osv.osv):
                     'period_id' :period_id,
                     'ref':slip.number
                 }
-                line_ids += [movel_pool.create(cr, uid, cre_rec)]
+                line_ids += [movel_pool.create(cr, uid, cre_rec, context=context)]
 
             rec = {
                 'state':'confirm',
@@ -578,12 +591,12 @@ class hr_payslip(osv.osv):
             }
             if not slip.period_id:
                 rec['period_id'] = period_id
-            
+
             dates = prev_bounds(slip.date)
-            exp_ids = exp_pool.search(cr, uid, [('date_valid','>=',dates[0]), ('date_valid','<=',dates[1]), ('state','=','invoiced')])
+            exp_ids = exp_pool.search(cr, uid, [('date_valid','>=',dates[0]), ('date_valid','<=',dates[1]), ('state','=','invoiced')], context=context)
             if exp_ids:
-                acc = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
-                for exp in exp_pool.browse(cr, uid, exp_ids):
+                acc = property_pool.get(cr, uid, 'property_account_expense_categ', 'product.category')
+                for exp in exp_pool.browse(cr, uid, exp_ids, context=context):
                     exp_res = {
                         'name':exp.name,
                         'amount_type':'fix',
@@ -594,12 +607,12 @@ class hr_payslip(osv.osv):
                         'expanse_id':exp.id,
                         'account_id':acc
                     }
-                    self.pool.get('hr.payslip.line').create(cr, uid, exp_res)
-            
-            self.write(cr, uid, [slip.id], rec)
-            
+                    payslip_pool.create(cr, uid, exp_res, context=context)
+
+            self.write(cr, uid, [slip.id], rec, context=context)
+
         return True
-        
+
 hr_payslip()
 
 class account_move_link_slip(osv.osv):
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 0d10ba0f248..084e81147a3 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -31,11 +31,12 @@ This module is integrated with the mail gateway to automatically tracks email
 sent to jobs@YOURCOMPANY.com. It's also integrated with the document management
 system to store and search in your CV base.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['hr','survey','crm'],
     'update_xml': [
         'wizard/hr_recruitment_phonecall_view.xml',
+        'wizard/hr_recruitment_create_partner_job_view.xml',
         'hr_recruitment_view.xml',
         'hr_recruitment_menu.xml',
 #        'report_hr_recruitment_view.xml',
@@ -43,7 +44,6 @@ system to store and search in your CV base.
         'security/ir.model.access.csv',
         'board_hr_recruitment_statistical_view.xml',
         'report/hr_recruitment_report_view.xml',
-        'wizard/hr_recruitment_create_partner_job_view.xml',
      ],
     'init_xml': [
         'hr_recruitment_data.xml'
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 2845768f59c..fca26885ae9 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -19,6 +19,9 @@
 #
 ##############################################################################
 
+import time
+from datetime import datetime, timedelta
+
 from osv import fields, osv
 from crm import crm
 import tools
@@ -45,12 +48,13 @@ AVAILABLE_PRIORITIES = [
 
 class hr_recruitment_stage(osv.osv):
     """ Stage of HR Recruitment """
-
     _name = "hr.recruitment.stage"
     _description = "Stage of Recruitment"
+    _order = 'sequence'
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."),
+        'department_id':fields.many2one('hr.department', 'Department'),
         'requirements': fields.text('Requirements')
     }
     _defaults = {
@@ -58,36 +62,75 @@ class hr_recruitment_stage(osv.osv):
     }
 hr_recruitment_stage()
 
+class hr_recruitment_degree(osv.osv):
+    """ Degree of HR Recruitment """
+    _name = "hr.recruitment.degree"
+    _description = "Degree of Recruitment"
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, translate=True),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of degrees."),
+    }
+    _defaults = {
+        'sequence': 1,
+    }
+hr_recruitment_degree()
+
 class hr_applicant(osv.osv, crm.crm_case):
     _name = "hr.applicant"
     _description = "Applicant"
     _order = "id desc"
     _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,
+        @param ids: List of Openday’s IDs
+        @return: difference between current date and log date
+        @param context: A standard dictionary for contextual values
+        """
+        res = {}
+        for issue in self.browse(cr, uid, ids, context=context):
+            for field in fields:
+                res[issue.id] = {}
+                duration = 0
+                ans = False
+                hours = 0
+
+                if field in ['day_open']:
+                    if issue.date_open:
+                        date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_open = datetime.strptime(issue.date_open, "%Y-%m-%d %H:%M:%S")
+                        ans = date_open - date_create
+                        date_until = issue.date_open
+
+                elif field in ['day_close']:
+                    if issue.date_closed:
+                        date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_close = datetime.strptime(issue.date_closed, "%Y-%m-%d %H:%M:%S")
+                        date_until = issue.date_closed
+                        ans = date_close - date_create
+                if ans:
+                    duration = float(ans.days)
+                    res[issue.id][field] = abs(float(duration))
+        return res
+
     _columns = {
         'name': fields.char('Name', size=128, required=True),
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
-        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team', \
-                        select=True, help='Sales team to which Case belongs to.\
-                             Define Responsible user and Email account for mail gateway.'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
-        'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
-                             will receive a copy of the future" \
-                            " communication between partner and users by email"),
+        'email_cc': fields.text('Watchers Emails', size=252 , help="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"),
         'probability': fields.float('Probability'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"),
         'create_date': fields.datetime('Creation Date' , readonly=True),
         'write_date': fields.datetime('Update Date' , readonly=True),
-#        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
-#                         domain="[('section_id','=',section_id),\
-#                        ('object_id.model', '=', 'crm.opportunity')]"),
-        'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', \
-                         domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.opportunity')]"),
+        'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
@@ -97,7 +140,10 @@ class hr_applicant(osv.osv, crm.crm_case):
         'user_id': fields.many2one('res.users', 'Responsible'),
         # Applicant Columns
         'date_closed': fields.datetime('Closed', readonly=True),
+        'date_open': fields.datetime('Opened', readonly=True),
         'date': fields.datetime('Date'),
+        'date_action': fields.date('Next Action Date'),
+        'title_action': fields.char('Next Action', size=64),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Appreciation'),
         'job_id': fields.many2one('hr.job', 'Applied Job'),
         'salary_proposed': fields.float('Proposed Salary', help="Salary Proposed by the Organisation"),
@@ -106,12 +152,16 @@ class hr_applicant(osv.osv, crm.crm_case):
         'partner_name': fields.char("Applicant's Name", size=64),
         'partner_phone': fields.char('Phone', size=32),
         'partner_mobile': fields.char('Mobile', size=32),
-        'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
+        'type_id': fields.many2one('hr.recruitment.degree', 'Degree'),
         'department_id':fields.many2one('hr.department', 'Department'),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'survey' : fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
         'response' : fields.integer("Response"),
         'reference': fields.char('Reference', size=128),
+        'day_open': fields.function(_compute_day, string='Days to Open', \
+                                method=True, multi='day_open', type="float", store=True),
+        'day_close': fields.function(_compute_day, string='Days to Close', \
+                                method=True, multi='day_close', type="float", store=True),
     }
 
     def _get_stage(self, cr, uid, context=None):
@@ -127,16 +177,18 @@ class hr_applicant(osv.osv, crm.crm_case):
 #        'user_id': crm.crm_case._get_default_user,
         'email_from': crm.crm_case. _get_default_email,
         'state': lambda *a: 'draft',
-        'section_id': crm.crm_case. _get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
-    def onchange_job(self,cr, uid, ids, job, context={}):
+    def onchange_job(self,cr, uid, ids, job, context=None):
+        job_obj = self.pool.get('hr.job')
+        if context is None:
+            context = {}
         result = {}
+
         if job:
-            job_obj = self.pool.get('hr.job')
-            result['department_id'] = job_obj.browse(cr, uid, job).department_id.id
+            result['department_id'] = job_obj.browse(cr, uid, job, context=context).department_id.id
             return {'value': result}
         return {'value': {'department_id': []}}
 
@@ -148,14 +200,15 @@ class hr_applicant(osv.osv, crm.crm_case):
         @param uid: the current user’s ID for security checks,
         @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):
-            section = (case.section_id.id or False)
+        for case in self.browse(cr, uid, ids, context=context):
+            department = (case.department_id.id or False)
             st = case.stage_id.id  or False
-            stage_ids = self.pool.get('hr.recruitment.stage').search(cr, uid, [])
+            stage_ids = stage_obj.search(cr, uid, ['|',('department_id','=',department),('department_id','=',False)], context=context)
             if st and stage_ids.index(st):
-                self.write(cr, uid, [case.id], {'stage_id': stage_ids[stage_ids.index(st)-1]})
+                self.write(cr, uid, [case.id], {'stage_id': stage_ids[stage_ids.index(st)-1]}, context=context)
         return True
 
     def stage_next(self, cr, uid, ids, context=None):
@@ -166,14 +219,15 @@ class hr_applicant(osv.osv, crm.crm_case):
         @param uid: the current user’s ID for security checks,
         @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):
-            section = (case.section_id.id or False)
+        for case in self.browse(cr, uid, ids, context=context):
+            department = (case.department_id.id or False)
             st = case.stage_id.id  or False
-            stage_ids = self.pool.get('hr.recruitment.stage').search(cr, uid, [])
+            stage_ids = stage_obj.search(cr, uid, ['|',('department_id','=',department),('department_id','=',False)], context=context)
             if st and len(stage_ids) != stage_ids.index(st)+1:
-                self.write(cr, uid, [case.id], {'stage_id': stage_ids[stage_ids.index(st)+1]})
+                self.write(cr, uid, [case.id], {'stage_id': stage_ids[stage_ids.index(st)+1]}, context=context)
         return True
 
     def action_makeMeeting(self, cr, uid, ids, context=None):
@@ -187,13 +241,14 @@ class hr_applicant(osv.osv, crm.crm_case):
 
         @return : Dictionary value for created Meeting view
         """
+        data_obj = self.pool.get('ir.model.data')
+        if context is None:
+            context = {}
         value = {}
-        for opp in self.browse(cr, uid, ids):
-            data_obj = self.pool.get('ir.model.data')
-
+        for opp in self.browse(cr, uid, ids, context=context):
             # Get meeting views
             result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'])
+            res = data_obj.read(cr, uid, result, ['res_id'], context=context)
             id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
             id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
             id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
@@ -207,7 +262,6 @@ class hr_applicant(osv.osv, crm.crm_case):
             context = {
                 'default_opportunity_id': opp.id,
                 'default_partner_id': opp.partner_id and opp.partner_id.id or False,
-                'default_section_id': opp.section_id and opp.section_id.id or False,
                 'default_email_from': opp.email_from,
                 'default_state': 'open',
                 'default_name': opp.name
@@ -240,28 +294,30 @@ class hr_applicant(osv.osv, crm.crm_case):
         """
         if not context:
             context = {}
-        record = self.browse(cr, uid, ids, 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)
         return value
 
-    def message_new(self, cr, uid, msg, context):
+    def message_new(self, cr, uid, msg, context=None):
         """
         Automatically calls when new email message arrives
-        
+
         @param self: The object pointer
         @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')
+        attach_obj = self.pool.get('ir.attachment')
+        if context is None:
+            context = {}
 
         subject = msg.get('subject')
         body = msg.get('body')
         msg_from = msg.get('from')
         priority = msg.get('priority')
-        
+
         vals = {
             'name': subject,
             'email_from': msg_from,
@@ -271,15 +327,15 @@ class hr_applicant(osv.osv, crm.crm_case):
         }
         if msg.get('priority', False):
             vals['priority'] = priority
-        
+
         res = mailgate_pool.get_partner(cr, uid, msg.get('from'))
         if res:
             vals.update(res)
-        res = self.create(cr, uid, vals, context)
-        
+        res = self.create(cr, uid, vals, context=context)
+
         message = _('A Job Request created') + " '" + subject + "' " + _("from Mailgate.")
         self.log(cr, uid, res, message)
-        
+
         attachents = msg.get('attachments', [])
         for attactment in attachents or []:
             data_attach = {
@@ -290,21 +346,23 @@ class hr_applicant(osv.osv, crm.crm_case):
                 'res_model': self._name,
                 'res_id': res,
             }
-            self.pool.get('ir.attachment').create(cr, uid, data_attach)
+            attach_obj.create(cr, uid, data_attach, context=context)
 
         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 
+        @param ids: List of update mail’s IDs
         """
-        
+        if context is None:
+            context = {}
+
         if isinstance(ids, (str, int, long)):
             ids = [ids]
-        
+
         msg_from = msg['from']
         vals.update({
             'description': msg['body']
@@ -324,13 +382,12 @@ class hr_applicant(osv.osv, crm.crm_case):
             if res and maps.get(res.group(1).lower(), False):
                 key = maps.get(res.group(1).lower())
                 vls[key] = res.group(2).lower()
-        
+
         vals.update(vls)
-        res = self.write(cr, uid, ids, vals)
+        res = self.write(cr, uid, ids, vals, context=context)
         return res
 
     def msg_send(self, cr, uid, id, *args, **argv):
-
         """ Send The Message
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -340,7 +397,7 @@ class hr_applicant(osv.osv, crm.crm_case):
             @param **args: Return Dictionary of Keyword Value
         """
         return True
-    
+
     def case_open(self, cr, uid, ids, *args):
         """
         @param self: The object pointer
@@ -350,6 +407,9 @@ class hr_applicant(osv.osv, crm.crm_case):
         @param *args: Give Tuple Value
         """
         res = super(hr_applicant, self).case_open(cr, uid, ids, *args)
+        date = self.read(cr, uid, ids, ['date_open'])[0]
+        if not date['date_open']:
+            self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),})
         for (id, name) in self.name_get(cr, uid, ids):
             message = _('Job request for') + " '" + name + "' "+ _("is Open.")
             self.log(cr, uid, id, message)
@@ -369,6 +429,19 @@ class hr_applicant(osv.osv, crm.crm_case):
             self.log(cr, uid, id, message)
         return res
 
+    def case_reset(self, cr, uid, ids, *args):
+        """Resets case as draft
+        @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 case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        res = super(hr_applicant, self).case_reset(cr, uid, ids, *args)
+        self.write(cr, uid, ids, {'date_open': False, 'date_closed':False})
+        return res
+
+
 hr_applicant()
 
 class hr_job(osv.osv):
@@ -377,7 +450,6 @@ class hr_job(osv.osv):
     _columns = {
         'survey_id': fields.many2one('survey', 'Survey'),
     }
-
 hr_job()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 8a4ddb93428..aaa386356c5 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -17,17 +17,17 @@
 
         <!--    Resource(type_id)        -->
 
-    <record model="crm.case.resource.type" id="type_job1">
+    <record model="hr.recruitment.degree" id="degree_graduate">
         <field name="name">Graduate</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
+        <field name="sequence">1</field>
     </record>
-    <record model="crm.case.resource.type" id="type_job2">
+    <record model="hr.recruitment.degree" id="degree_licenced">
         <field name="name">Licenced</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
+        <field name="sequence">2</field>
     </record>
-    <record model="crm.case.resource.type" id="type_job3">
+    <record model="hr.recruitment.degree" id="degree_bac5">
         <field name="name"> > Bac +5</field>
-        <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
+        <field name="sequence">3</field>
     </record>
 
     <record model="hr.recruitment.stage" id="stage_job1">
diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
index 3eba3bc17de..4811e2b91a2 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -9,7 +9,7 @@
     <record id="hr_case_salesman0" model="hr.applicant">
         <field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
         <field eval="time.strftime('%Y-%m-03')" name="date_deadline"/>
-        <field name="type_id" ref="type_job1"/>
+        <field name="type_id" ref="degree_graduate"/>
         <field name="partner_id" ref="base.res_partner_asus"/>
         <field eval="'2'" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -27,9 +27,8 @@
     <record id="hr_case_traineemca0" model="hr.applicant">
         <field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
         <field name="partner_address_id" ref="base.res_partner_address_14"/>
-        <field name="som" ref="base.som_fury"/>
         <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
-        <field name="type_id" ref="type_job3"/>
+        <field name="type_id" ref="degree_bac5"/>
         <field name="partner_id" ref="base.res_partner_15"/>
         <field eval="'3'" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -47,10 +46,9 @@
     </record>
     <record id="hr_case_fresher0" model="hr.applicant">
         <field model="res.partner.canal" name="canal_id" search="[('name','=','direct')]"/>
-        <field name="som" ref="base.som_happy"/>
         <field eval="time.strftime('%Y-%m-15 16:10:00')" name="date"/>
         <field eval="time.strftime('%Y-%m-18')" name="date_deadline"/>
-        <field name="type_id" ref="type_job2"/>
+        <field name="type_id" ref="degree_licenced"/>
         <field name="partner_id" ref="base.res_partner_5"/>
         <field eval="'1'" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -68,7 +66,7 @@
         <field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
         <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
         <field name="categ_id" ref="categ_job2"/>
-        <field name="type_id" ref="type_job3"/>
+        <field name="type_id" ref="degree_bac5"/>
         <field name="partner_id" ref="base.res_partner_10"/>
         <field eval="'3'" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -83,7 +81,7 @@
     <record id="hr_case_marketingjob0" model="hr.applicant">
         <field eval="time.strftime('%Y-%m-26 17:15:32')" name="date"/>
         <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="type_id" ref="type_job2"/>
+        <field name="type_id" ref="degree_licenced"/>
         <field name="partner_id" ref="base.res_partner_11"/>
         <field eval="'4'" name="priority"/>
         <field name="user_id" ref="base.user_demo"/>
@@ -101,7 +99,7 @@
     <record id="hr_case_financejob0" model="hr.applicant">
         <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
         <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="type_id" ref="type_job2"/>
+        <field name="type_id" ref="degree_licenced"/>
         <field name="partner_id" ref="base.res_partner_11"/>
         <field eval="'4'" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -119,9 +117,8 @@
     <record id="hr_case_traineemca1" model="hr.applicant">
         <field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
         <field name="partner_address_id" ref="base.res_partner_address_14"/>
-        <field name="som" ref="base.som_fury"/>
         <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
-        <field name="type_id" ref="type_job3"/>
+        <field name="type_id" ref="degree_bac5"/>
         <field name="partner_id" ref="base.res_partner_15"/>
         <field eval="'3'" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 971423d45a7..e49afdee833 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -1,50 +1,47 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
-    <menuitem icon="terp-hr" id="base.menu_hr" name="Human Resources"/>
+	<data>
 
-    ######################## JOB OPPORTUNITIES (menu) ###########################
-     <record model="ir.actions.act_window" id="crm_case_categ0_act_job">
-        <field name="name">Applicants</field>
-        <field name="res_model">hr.applicant</field>
-        <field name="view_mode">tree,form,graph</field>
-        <field name="view_id" ref="crm_case_tree_view_job"/>
-        <field name="context">{"search_default_user_id":uid}</field>
-        <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
+	    ######################## JOB OPPORTUNITIES (menu) ###########################
+	     <record model="ir.actions.act_window" id="crm_case_categ0_act_job">
+	        <field name="name">Applicants</field>
+	        <field name="res_model">hr.applicant</field>
+	        <field name="view_mode">tree,form,graph,calendar</field>
+	        <field name="view_id" ref="crm_case_tree_view_job"/>
+	        <field name="context">{"search_default_user_id":uid, 'search_default_current': 1}</field>
+	        <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
+	    </record>
 
-    </record>
-    <record model="ir.actions.act_window.view" id="action_hr_sec_tree_view_act_job">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_job"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_job"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_hr_sec_form_view_act_job">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_job"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_job"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_hr_sec_graph_view_act_job">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <field name="view_id" ref="crm_case_graph_view_job"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_job"/>
-    </record>
-    <!--<menuitem
-        name="Jobs - Hiring Process"
-        id="menu_crm_case_job_req_main"
-        parent="base.menu_hr"/>-->
-     <menuitem
-        name="Recruitment"
-        id="base.menu_crm_case_job_req_main"
-        parent="base.menu_hr"
-        sequence="1"/>
+	    <record model="ir.actions.act_window.view" id="action_hr_sec_tree_view_act_job">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="crm_case_tree_view_job"/>
+	        <field name="act_window_id" ref="crm_case_categ0_act_job"/>
+	    </record>
 
- <!--
-        ALL JOBS REQUESTS
-    -->
-    <menuitem name="Applicants" parent="base.menu_crm_case_job_req_main" id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/>
+	    <record model="ir.actions.act_window.view" id="action_hr_sec_form_view_act_job">
+	        <field name="sequence" eval="3"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="crm_case_form_view_job"/>
+	        <field name="act_window_id" ref="crm_case_categ0_act_job"/>
+	    </record>
 
-</data>
+	    <record model="ir.actions.act_window.view" id="action_hr_sec_graph_view_act_job">
+	        <field name="sequence" eval="4"/>
+	        <field name="view_mode">graph</field>
+	        <field name="view_id" ref="crm_case_graph_view_job"/>
+	        <field name="act_window_id" ref="crm_case_categ0_act_job"/>
+	    </record>
+
+	    <menuitem
+	        name="Recruitment"
+	        id="base.menu_crm_case_job_req_main"
+	        parent="hr.menu_hr_root"
+	        sequence="1"/>
+
+	 <!-- ALL JOBS REQUESTS -->
+
+	    <menuitem name="Applicants" parent="base.menu_crm_case_job_req_main" id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/>
+
+	</data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 9956010fcb6..10bf9a3a2b7 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-	    <menuitem
-	        id="menu_hr_recruitment_recruitment"
-	        name="Recruitment"
-	        parent="hr.menu_hr_configuration"
-	        sequence="2"/>
-	    <menuitem
-	        id="menu_hr_config_applicant"
-	        name="Applicant"
-	        parent="menu_hr_recruitment_recruitment"
-	        sequence="2"/>
+        <menuitem
+            id="menu_hr_recruitment_recruitment"
+            name="Recruitment"
+            parent="hr.menu_hr_configuration"
+            sequence="2"/>
+        <menuitem
+            id="menu_hr_config_applicant"
+            name="Applicant"
+            parent="menu_hr_recruitment_recruitment"
+            sequence="2"/>
 
     # ------------------------------------------------------
     # Job Categories
@@ -55,6 +55,8 @@
                 <field name="stage_id"/>
                 <button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
                 <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
+                <field name="title_action" invisible="context.get('invisible_next_action', True)"/>
+                <field name="date_action" invisible="context.get('invisible_next_date', True)"/>
                 <field name="survey" invisible="1"/>
                 <field name="response" invisible="1"/>
                 <field name="priority"/>
@@ -67,7 +69,6 @@
                 <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                 <button name="case_close" string="Hired" states="open,draft,pending" type="object" icon="terp-partner"/>
                 <button name="case_cancel" string="Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-
             </tree>
         </field>
     </record>
@@ -85,26 +86,32 @@
                         <button string="Schedule a Phone Call" name="%(action_hr_recruitment_phonecall)d" icon="gtk-redo" type="action"/>
                         <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="terp-hr"/>
                     <newline/>
+                    <field name="department_id" widget="selection"/>
                     <group colspan="2" col="4">
-                        <field name="stage_id"/>
+                        <field name="stage_id" domain="[('department_id','=',department_id)]"/>
                         <button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                     </group>
-                        <field name="user_id"/>
-                        <field name="department_id" widget="selection"/>
-                        <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="terp-hr"/>
-                        <button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
-                        <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+                    <field name="user_id"/>
+                    <button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
+                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+                    <newline/>
+					<field name="date_action"/>
+					<field name="title_action"/>
                 </group>
                 <notebook colspan="4">
                     <page string="Job Info">
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="Contact"/>
+                        <group col="3" colspan="2">
+                            <separator colspan="3" string="Contact"/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
-                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-                            <field name="email_from"/>
-                            <field name="partner_phone"/>
-                            <field name="partner_mobile"/>
+                            <button string="Create Partner"
+                                    name="%(action_hr_recruitment_partner_create)d"
+                                    icon="terp-mail-replied" type="action"/>
+                            <newline/>
+                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
+                            <field name="email_from" colspan="3"/>
+                            <field name="partner_phone" colspan="3"/>
+                            <field name="partner_mobile" colspan="3"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Contract Data"/>
@@ -114,7 +121,8 @@
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Qualification"/>
-                            <field name="type_id" domain="[('object_id.model', '=', 'hr.applicant')]"/>
+                            <!-- <field name="type_id" domain="[('object_id.model', '=', 'hr.applicant')]"/>-->
+                            <field name="type_id"/>
                             <field name="priority" string="Appreciation"/>
                             <field name="reference"/>
                         </group>
@@ -123,6 +131,7 @@
                            <field name="create_date"/>
                            <field name="write_date"/>
                            <field name="date_closed"/>
+                           <field name="date_open"/>
                         </group>
                         <separator colspan="4" string="Status"/>
                         <group col="8" colspan="4">
@@ -134,62 +143,56 @@
                             <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                         </group>
                    </page>
-                   <page string="Internal Notes">
+                   <page string="Notes">
                        <field name="description" nolabel="1" colspan="4"/>
                    </page>
-                   <page string="History" groups="base.group_extended">
+<!--                <page string="History" groups="base.group_extended">
                        <field name="id"/>
                        <field name="active"/>
-                       <field name="log_ids" nolabel="1" colspan="4">
-                        <tree string="Logs">
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                        </tree>
-                        <form string="Logs">
-                            <separator string="Action Information" colspan="4"/>
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                        </form>
-                    </field>
-                    </page>
+                    </page>  -->
                    <page string="Emails" groups="base.group_extended">
                        <group colspan="4">
-                           <field colspan="4" name="email_cc" string="CC"/>
+                           <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                        </group>
-                       <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
-                           <form string="Communication history">
-                                    <group col="6" colspan="4">
-                                        <field name="date"/>
-                                        <field name="email_to"/>
-                                        <field name="email_from"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Details">
-                                            <field name="description" colspan="4" nolabel="1"/>
-                                        </page>
-                                        <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                    <button colspan="4"
-                                    string="Reply to Last Email"
+                       <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                            <tree string="Communication history">
+                                <field name="display_text" string="History Information"/>
+                                <button
+                                    string="Reply"
                                     name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'hr.applicant'}"
-                                    icon="gtk-undo" type="action" />
-                                </form>
-                                <tree string="Communication history">
+                                    context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True}"
+                                    icon="terp-mail-replied" type="action" />
+                            </tree>
+                            <form string="Communication history">
+                                <group col="4" colspan="4">
+                                    <field name="email_from"/>
                                     <field name="date"/>
-                                    <field name="email_from" />
-                                    <field name="email_to"/>
-                                    <field name="description"/>
-                                </tree>
-                            </field>
-                           <button colspan="4" string="Send New Email"
-                               name="%(crm.action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'hr.applicant'}"
-                               icon="gtk-go-forward" type="action" />
+                                    <field name="email_to" widget="char" size="512"/>
+                                    <field name="email_cc" widget="char" size="512"/>
+                                    <field name="name" colspan="4" widget="char" size="512"/>
+                                </group>
+                                <notebook colspan="4">
+                                    <page string="Details">
+                                        <field name="description" colspan="4" nolabel="1"/>
+                                    </page>
+                                    <page string="Attachments">
+                                        <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                    </page>
+                                </notebook>
+                                <button colspan="4"
+                                    string="Reply"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True}"
+                                    icon="terp-mail-replied" type="action" />
+                            </form>
+                        </field>
+                       <button colspan="2" string="Send New Email"
+                           name="%(crm.action_crm_send_mail)d"
+                           context="{'mail':'new', 'model': 'hr.applicant'}"
+                           icon="terp-mail-message-new" type="action" />
+                       <button colspan="2" string="Forward"
+                           name="%(crm.crm_lead_forward_to_partner_act)d"
+                           icon="terp-mail-forward" type="action" />
                  </page>
                 </notebook>
             </form>
@@ -220,6 +223,7 @@
                    domain="[('state','in',('draft','open'))]"
                    help="All new and in progress jobs"
                    default="1"
+                   name="current"
                />
                <filter icon="terp-document-new" string="New"
                    domain="[('state','=','draft')]"
@@ -234,10 +238,15 @@
                    help="Pending Jobs"
                />
                <separator orientation="vertical"/>
+               <filter icon="terp-check" string="Next Actions"
+                    context="{'invisible_next_action':False, 'invisible_next_date':False}"
+                    domain="[]"
+                    help="View Next Action and Date"/>
+               <separator orientation="vertical"/>
                <field name="partner_name"/>
                <field name="email_from"/>
                <field name="job_id" widget="selection"/>
-               <field name="user_id" widget="selection">
+               <field name="user_id">
                     <filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="terp-personal-" separator="1"/>
                </field>
                <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
@@ -264,6 +273,24 @@
         </field>
     </record>
 
+    <!-- CRM Lead Calendar View -->
+
+    <record model="ir.ui.view" id="hr_applicant_calendar_view">
+        <field name="name">Hr Applicants Calendar</field>
+        <field name="model">hr.applicant</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Applicants"
+                date_start="date_action" color="user_id">
+                <field name="name" />
+                <field name="partner_name" />
+                <field name="stage_id" />
+            </calendar>
+        </field>
+    </record>
+
+
     # ------------------------------------------------------
     # HR Job
     # ------------------------------------------------------
@@ -288,8 +315,9 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Stages">
-                <field name="sequence"/>
+                <field name="sequence" invisible="1"/>
                 <field name="name"/>
+                <field name="department_id"/>
             </tree>
         </field>
     </record>
@@ -302,9 +330,12 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Stage">
-                <separator string="Stage Definition" colspan="4"/>
-                <field name="name" select="1"/>
-                <field name="sequence"/>
+                <group colspan="4" col="6">
+                    <separator string="Stage Definition" colspan="6"/>
+                    <field name="name" select="1"/>
+                    <field name="department_id"/>
+                    <field name="sequence"/>
+                </group>
                 <separator string="Requirements" colspan="4"/>
                 <field name="requirements" nolabel="1" colspan="4"/>
             </form>
@@ -327,5 +358,42 @@
         action="hr_recruitment_stage_act"
         sequence="1"/>
 
+<!-- Degree Tree View -->
+
+    <record model="ir.ui.view" id="hr_recruitment_degree_tree">
+        <field name="name">hr.recruitment.degree.tree</field>
+        <field name="model">hr.recruitment.degree</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Degree">
+                <field name="sequence" invisible="1"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+<!-- Degree Form View -->
+
+    <record model="ir.ui.view" id="hr_recruitment_degree_form">
+        <field name="name">hr.recruitment.degree.form</field>
+        <field name="model">hr.recruitment.degree</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Degree">
+                    <field name="name" select="1"/>
+                    <field name="sequence"/>
+            </form>
+        </field>
+    </record>
+
+<!-- Degree Action -->
+
+    <record id="hr_recruitment_degree_action" model="ir.actions.act_window">
+        <field name="name">Degree</field>
+        <field name="res_model">hr.recruitment.degree</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="hr_recruitment_degree_tree"/>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 62011b21a04..9fa22343ceb 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -93,6 +93,7 @@ class hr_recruitment_report(osv.osv):
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'date': fields.date('Date', readonly=True),
+        'opening_date': fields.date('Date of Opening', readonly=True),
         'date_closed': fields.date('Closed', readonly=True),
         'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
@@ -103,7 +104,11 @@ class hr_recruitment_report(osv.osv):
         'salary_exp' : fields.float("Salary Expected"),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
-        'available' : fields.float("Availability")
+        'available' : fields.float("Availability"),
+        'delay_open': fields.float('Avg. Delay to Open', digits=(16,2), readonly=True, group_operator="avg",
+                                       help="Number of Days to close the project issue"),
+        'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
+                                       help="Number of Days to close the project issue"),
 
     }
     _order = 'date desc'
@@ -131,6 +136,8 @@ class hr_recruitment_report(osv.osv):
                      s.stage_id,
                      sum(salary_proposed) as salary_prop,
                      sum(salary_expected) as salary_exp,
+                     extract('epoch' from (s.date_open-s.create_date))/(3600*24) as  delay_open,
+                     extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as  delay_close,
                      count(*) as nbr
                  from hr_applicant s
                  group by
@@ -139,6 +146,9 @@ class hr_recruitment_report(osv.osv):
                      to_char(s.create_date, 'YYYY-MM-DD') ,
                      date_trunc('day',s.create_date),
                      date_trunc('day',s.date_closed),
+                     s.date_open,
+                     s.create_date,
+                     s.date_closed,
                      s.state,
                      s.partner_id,
                      s.partner_address_id,
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 83fb9e6d9b0..a789206b518 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -23,6 +23,8 @@
                 <field name="nbr" sum="# Cases"/>
                 <field name="salary_prop" sum="Salary Proposed" />
                 <field name="salary_exp" sum="Salary Expected"/>
+                <field name="delay_open" avg='Avg Opening Delay'/>
+                <field name="delay_close" avg='Avg Closing Delay'/>
                 <field name="available" sum="Available"/>
             </tree>
         </field>
@@ -60,7 +62,7 @@
 	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                    help="Recruitment during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <filter string="Draft"
+	                <filter string="New"
                     	icon="terp-document-new"
                     	domain="[('state','=','draft')]"
                     	help = "Draft recruitment"/>
@@ -73,9 +75,9 @@
                    		domain="[('state','=','pending')]"
                    		help = "Pending recruitment"/>
   					<separator orientation="vertical"/>
-  					<field name="partner_id"/>
+  					<field name="job_id"/>
 					<field name="department_id" widget="selection"/>
-                    <field name="user_id" widget="selection">
+                    <field name="user_id">
                         <filter icon="terp-hr"
                             string="My Recruitment"
                             help="My Recruitment"
@@ -101,7 +103,7 @@
                 </group>
 
                 <newline/>
-                <group expand="0" string="Extended options..." groups="base.group_extended">
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
                     <field name="state"/>
                     <separator orientation="vertical"/>
                     <field name="date"/>
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 40e82cb1a15..bad86afd5c0 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_applicant","hr.applicant","model_hr_applicant","hr.group_hr_user",1,1,1,1
 "access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","hr.group_hr_manager",1,0,0,0
+"access_hr_recruitment_stage","hr.recruitment.stage","model_hr_recruitment_stage","hr.group_hr_user",1,1,1,1
+"access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","hr.group_hr_user",1,1,1,1
diff --git a/addons/hr_recruitment/test/test_hr_recruitment.yml b/addons/hr_recruitment/test/test_hr_recruitment.yml
index 3b865efe113..f5689b67787 100644
--- a/addons/hr_recruitment/test/test_hr_recruitment.yml
+++ b/addons/hr_recruitment/test/test_hr_recruitment.yml
@@ -1,91 +1,86 @@
-- |
-  In order to test hr_recruitment module for OpenERP, I will create applicants form,   Manages job positions and the recruitement process.
-- |
-  I create job position for employee to manage job position.
 -
-  |
-  For that First I create Department  "R & D" in Department form for which I make recruitment.
-- 
+  In order to test hr_recruitment module for OpenERP, I will create applicants form, Manages job positions and the recruitment process.
+-
+
+  I create a department.
+-
   !record {model: hr.department, id: hr_department_rd0}:
     manager_id: base.user_root
     name: 'R & D '
-    
-- |
-  Now I will create new Job Position. I will check successfull creation of new Job Position by adding the information.
-- 
+
+-
+  I create new Job Position.
+-
   !record {model: hr.job, id: hr_job_jea0}:
     department_id: 'hr_department_rd0'
-    description: 'Position of Junier Application Engineer '
+    description: 'Position of Jr. Application Engineer'
     expected_employees: 5
-    name: 'JEA '
-- |
-  Given that I have stage "Initial Jobs Demand".
-- 
+    name: 'JAE '
+-
+  I create a recruitment stage "Initial Jobs Demand".
+-
   !record {model: hr.recruitment.stage, id: hr_recrutiment_stage_first0}:
     name: 'Initial Jobs Demand'
-    sequence: 1    
-- |
-  I create applicants for "Fresher" and specify  job information for that applicant.
-- 
+    sequence: 1
+-
+  I create an applicant.
+-
   !record {model: hr.applicant, id: hr_applicant_fresher0}:
     availability: 0.0
     department_id: hr.dep_it
     name: Fresher
     partner_address_id: base.res_partner_address_tang
     partner_id: base.res_partner_asus
-    partner_name: Jose
-    partner_phone: '999666735'
+    partner_name: Marion Jones
+    partner_phone: '1111112223'
     response: 0.0
     salary_expected: 0.0
     salary_proposed: 0.0
-    stage_id: crm.stage_lead3
-    type_id: hr_recruitment.type_job2
-    stage_id:  hr_recrutiment_stage_first0
-    
-- |
-  I check that applicant  is on "draft" state.
+    stage_id: hr_recrutiment_stage_first0
+    type_id: hr_recruitment.degree_licenced
+
+-
+  I check that applicant is on "draft" state.
 -
   !assert {model: hr.applicant, id:  hr_applicant_fresher0}:
-    - state == 'draft'  
-    
-- |
-  I  start progress by click on "In Progress" button.
-- 
+    - state == 'draft'
+
+-
+  I change the state by click on "In Progress" button.
+-
   !python {model: hr.applicant}: |
     self.case_open(cr, uid, [ref("hr_applicant_fresher0")], {"active_ids": [ref("hr_recruitment.menu_crm_case_categ0_act_job")],
-      }) 
+      })
 
-- |
-  Given that I have case category "Employee".
+-
+  I create a new case category.
 -
   !record {model: crm.case.categ, id: crm_case_categ_employee0}:
     name: 'Employee'
-      
-- |
-  I make  phonecall for this applicant by click on "Schedule a Phone Call" button.
+
 -
-  !record {model: hr.recruitment.job2phonecall, id: hr_recruitment_forinterview0}: 
+  I schedule a phonecall for this applicant by click on "Schedule a Phone Call" button.
+-
+  !record {model: hr.recruitment.job2phonecall, id: hr_recruitment_forinterview0}:
     user_id: base.user_root
     deadline: '05/28/2010 11:51:00'
     note: 'For interview.'
     category_id: 'crm_case_categ_employee0'
-      
-- |
+
+-
   I click on "Schedule phonecall" button of this wizard.
 -
   !python {model: hr.recruitment.job2phonecall}: |
-     self.make_phonecall(cr, uid, [ref('hr_recruitment_forinterview0')], {'active_ids': [ref('hr_applicant_fresher0')]})  
-  
-- |
-  I schedule meeting for interview of this applicant by click on "Schdule Meeting" button.
-- 
+     self.make_phonecall(cr, uid, [ref('hr_recruitment_forinterview0')], {'active_ids': [ref('hr_applicant_fresher0')]})
+
+-
+  I schedule meeting for interview of this applicant by click on "Schedule Meeting" button.
+-
   !python {model: hr.applicant}: |
      self.action_makeMeeting(cr, uid, [ref('hr_recruitment_forinterview0')])
--  |
-   I can see that Meeting's calendar view is shown.
-   then I click on the date on which I want schedule meeting.
-   I fill proper data for that meeting and save it.
-- 
+-
+  I create an entry for the meeting with the applicant.
+-
   !record {model: crm.meeting, id: crm_meeting_fresher0}:
     alarm_id: base_calendar.alarm1
     count: 0.0
@@ -101,15 +96,14 @@
     rrule_type: none
     state: open
     user_id: base.user_root
-    
-- |
-  After Meeting of this applicant , I hired employee by click on "Hired" button of this form.
-- 
+
+-
+  On a successful meeting with the applicant, I hired employee by click on "Hired" button.
+-
   !python {model: hr.applicant}: |
      self.case_close(cr, uid, [ref('hr_applicant_fresher0')])
-- |
-  I check that applicant state is "done".
+-
+  I check that applicant state is "Hired".
 -
   !assert {model: hr.applicant, id: hr_applicant_fresher0}:
     - state == 'done'
-  
\ No newline at end of file
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
index e9b68de37ea..28de96db4e4 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@ -31,9 +31,11 @@ class hr_recruitment_partner_create(osv.osv_memory):
 
     def view_init(self, cr , uid , fields_list, context=None):
         case_obj = self.pool.get('hr.applicant')
-        for case in case_obj.browse(cr, uid, context['active_ids']):
+        if context is None:
+            context = {}
+        for case in case_obj.browse(cr, uid, context['active_ids'], context=context):
             if case.partner_id:
-                raise osv.except_osv(_('Warning !'),
+                raise osv.except_osv(_('Error !'),
                     _('A partner is already defined on this job request.'))
         pass
 
@@ -45,31 +47,31 @@ class hr_recruitment_partner_create(osv.osv_memory):
 
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [], context)[0]
+        data = self.read(cr, uid, ids, [], context=context)[0]
         result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
+        res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
 
-        for case in case_obj.browse(cr, uid, context['active_ids']):
-            partner_id = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])
+        for case in case_obj.browse(cr, uid, context['active_ids'], context=context):
+            partner_id = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)], context=context)
             if partner_id:
-                raise osv.except_osv(_('Warning !'),_('A partner is already existing with the same name.'))
+                raise osv.except_osv(_('Error !'),_('A partner is already existing with the same name.'))
             partner_id = partner_obj.create(cr, uid, {
                 'name': case.partner_name or case.name,
                 'user_id': case.user_id.id,
                 'comment': case.description,
-            })
+            }, context=context)
             contact_id = contact_obj.create(cr, uid, {
                 'partner_id': partner_id,
                 'name': case.partner_name,
                 'phone': case.partner_phone,
                 'mobile': case.partner_mobile,
                 'email': case.email_from
-            })
+            }, context=context)
 
             case_obj.write(cr, uid, case.id, {
                 'partner_id': partner_id,
                 'partner_address_id': contact_id
-            })
+            }, context=context)
         if data['close']:
             case_obj.case_close(cr, uid, context['active_ids'])
 
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index 1eaaa2fefdd..23e30d76113 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -9,9 +9,7 @@
             <field name="arch" type="xml">
 			<form string="Convert To Partner">
 			    <group col="4" colspan="6">
-			            <label string="Are you sure you want to create a partner based on this job request ?" colspan="4"/>
-       					<label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        				<!--field name="close"/-->
+			            <label string="Are you sure you want to create a partner based on this job request ?"/>
 				</group>
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
@@ -31,15 +29,5 @@
             <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="hr_recruitment_partner_create_values">
-            <field name="model_id" ref="model_hr_applicant" />
-            <field name="object" eval="1" />
-            <field name="name">Create Partner</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_recruitment_partner_create'))" />
-            <field name="key">action</field>
-            <field name="model">hr.applicant</field>
-        </record>
-
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
index 0517d7d7965..4d3917178d7 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@ -36,16 +36,22 @@ class job2phonecall(osv.osv_memory):
 
     def _date_user(self, cr, uid, context=None):
         case_obj = self.pool.get('hr.applicant')
-        case = case_obj.browse(cr, uid, context['active_id'])
+        if context is None:
+            context = {}
+        case = case_obj.browse(cr, uid, context['active_id'], context=context)
         return case.user_id and case.user_id.id or False
 
     def _date_category(self, cr, uid, context=None):
-        categ_id = self.pool.get('crm.case.categ').search(cr, uid, [('name','=','Outbound')])
+        if context is None:
+            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
 
     def _get_note(self, cr, uid, context=None):
         case_obj = self.pool.get('hr.applicant')
-        case = case_obj.browse(cr, uid, context['active_id'])
+        if context is None:
+            context = {}
+        case = case_obj.browse(cr, uid, context['active_id'], context=context)
         return case.description or ''
 
     _defaults = {
@@ -59,11 +65,12 @@ class job2phonecall(osv.osv_memory):
         job_case_obj = self.pool.get('hr.applicant')
         data_obj = self.pool.get('ir.model.data')
         phonecall_case_obj = self.pool.get('crm.phonecall')
-
+        if context is None:
+            context = {}
         form = self.read(cr, uid, ids, [], context=context)[0]
 #        form = data['form']
         result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
+        res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
         # Select the view
 
         id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
@@ -73,7 +80,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']):
+        for job in job_case_obj.browse(cr, uid, context['active_ids'], context=context):
             #TODO : Take other info from job
             new_phonecall_id = phonecall_case_obj.create(cr, uid, {
                         'name' : job.name,
@@ -90,11 +97,11 @@ class job2phonecall(osv.osv_memory):
                         'description':job.description,
                         'date':job.date,
                     }, context=context)
-            new_phonecall = phonecall_case_obj.browse(cr, uid, new_phonecall_id)
+            new_phonecall = phonecall_case_obj.browse(cr, uid, new_phonecall_id, context=context)
             vals = {}
 #            if not job.case_id:
 #                vals.update({'phonecall_id' : new_phonecall.id})
-            job_case_obj.write(cr, uid, [job.id], vals)
+            job_case_obj.write(cr, uid, [job.id], vals, context=context)
             job_case_obj.case_cancel(cr, uid, [job.id])
             phonecall_case_obj.case_open(cr, uid, [new_phonecall_id])
 
@@ -111,4 +118,4 @@ class job2phonecall(osv.osv_memory):
 
 job2phonecall()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:>>>>>>> MERGE-SOURCE
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 66bcfe46a43..c7207b6761c 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -35,7 +35,7 @@ Lots of reporting on time and employee tracking are provided.
 It is completely integrated with the cost accounting module. It allows you
 to set up a management by affair.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account', 'hr', 'base', 'hr_attendance', 'process'],
     'init_xml': ['hr_timesheet_data.xml'],
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index ea13dba89e6..ec6fbc2d1fc 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -47,7 +47,9 @@ class hr_analytic_timesheet(osv.osv):
         'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id', relation='account.analytic.account', store=True),
     }
 
-    def unlink(self, cr, uid, ids, context={}):
+    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
@@ -55,7 +57,9 @@ class hr_analytic_timesheet(osv.osv):
         return super(hr_analytic_timesheet, self).unlink(cr, uid, ids, context=context)
 
 
-    def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, unit, context={}):
+    def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, unit, context=None):
+        if context is None:
+            context = {}
         res = {}
         if prod_id and unit_amount:
             # find company
@@ -63,9 +67,11 @@ class hr_analytic_timesheet(osv.osv):
             res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, context=context)
         return res
 
-    def _getEmployeeProduct(self, cr, uid, context={}):
+    def _getEmployeeProduct(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         emp_obj = self.pool.get('hr.employee')
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))])
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
         if emp_id:
             emp=emp_obj.browse(cr, uid, emp_id[0], context=context)
             if emp.product_id:
@@ -76,7 +82,7 @@ class hr_analytic_timesheet(osv.osv):
         emp_obj = self.pool.get('hr.employee')
         if context is None:
             context = {}
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))])
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
         if emp_id:
             emp=emp_obj.browse(cr, uid, emp_id[0], context=context)
             if emp.product_id:
@@ -87,7 +93,7 @@ class hr_analytic_timesheet(osv.osv):
         emp_obj = self.pool.get('hr.employee')
         if context is None:
             context = {}
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))])
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
         if emp_id:
             emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
             if bool(emp.product_id):
@@ -102,7 +108,7 @@ class hr_analytic_timesheet(osv.osv):
         emp_obj = self.pool.get('hr.employee')
         if context is None:
             context = {}
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))])
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
         if emp_id:
             emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
             if emp.journal_id:
@@ -129,7 +135,9 @@ class hr_analytic_timesheet(osv.osv):
                 return {'value':{},'warning':warning}
         return {'value':{}}
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
         emp_obj = self.pool.get('hr.employee')
         emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
         ename = ''
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index a3f385272d0..e64f3628491 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        
+
         <record id="product_consultant" model="product.product">
             <field name="default_code">DEV</field>
             <field name="list_price">75.0</field>
@@ -15,11 +15,25 @@
             <field name="procure_method">make_to_order</field>
             <field eval="False" name="purchase_ok"/>
         </record>
-        
+
         <!-- complete our example employee -->
         <record id="hr.employee1" model="hr.employee">
             <field name="product_id" ref="product_consultant"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
+
+        <record id="working_hours" model="hr.analytic.timesheet">
+            <field name="name">Working Hours For OpenERP SA</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date"/>
+            <field eval="0.00" name="unit_amount"/>
+            <field name="product_id" ref="product_consultant"/>
+            <field name="product_uom_id" ref="product.uom_hour"/>
+            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field eval="0.00" name="amount"/>
+            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="journal_id" ref="analytic_journal"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index f6527d5c6e8..d612706257f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -83,6 +83,7 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
+            <field name="help">This functionality gives you a list of work done by user, product and analytic account (or project). A search tool allows you to make fine-grained analysis.</field>
         </record>
 
 		<menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
diff --git a/addons/hr_timesheet/i18n/ca.po b/addons/hr_timesheet/i18n/ca.po
index 2ecad7cc707..9c878ed02e2 100644
--- a/addons/hr_timesheet/i18n/ca.po
+++ b/addons/hr_timesheet/i18n/ca.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 07:12+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-07-24 10:06+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-06-22 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-07-25 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -112,7 +113,7 @@ msgstr "Producte"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "août"
-msgstr ""
+msgstr "Agost"
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
@@ -157,11 +158,9 @@ msgstr "Temps total"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "juillet"
-msgstr ""
+msgstr "Juliol"
 
 #. module: hr_timesheet
-#: xsl:hr.analytical.timesheet:0
-#: xsl:hr.analytical.timesheet_users:0
 #: model:ir.ui.menu,name:hr_timesheet.next_id_48
 msgid "Timesheet"
 msgstr "Full d'assistència"
@@ -171,14 +170,14 @@ msgstr "Full d'assistència"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "janvier"
-msgstr ""
+msgstr "Gener"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "juin"
-msgstr ""
+msgstr "Juny"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_my
@@ -233,7 +232,7 @@ msgstr "XML invàlid per a la definició de la vista!"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "avril"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
@@ -255,7 +254,7 @@ msgstr "Selecciona usuaris"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "novembre"
-msgstr ""
+msgstr "Novembre"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
@@ -283,7 +282,7 @@ msgstr "Estat actual"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "octobre"
-msgstr ""
+msgstr "Octubre"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -295,7 +294,7 @@ msgstr "Estadístiques d'anàlisis"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "décembre"
-msgstr ""
+msgstr "Desembre"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,info:0
@@ -345,7 +344,7 @@ msgstr "Recursos humans (codificació d'horaris)"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "mars"
-msgstr ""
+msgstr "Març"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
@@ -358,7 +357,7 @@ msgstr "Total"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "mai"
-msgstr ""
+msgstr "Maig"
 
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_out,si_result:0
@@ -375,7 +374,7 @@ msgstr "Canvia treball"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "février"
-msgstr ""
+msgstr "Febrer"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -469,9 +468,105 @@ msgstr "Horari d'empleats"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "septembre"
-msgstr ""
+msgstr "Setembre"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Timesheets"
 msgstr "Horaris"
+
+#, python-format
+#~ msgid "Wed"
+#~ msgstr "Dc"
+
+#, python-format
+#~ msgid "No employee defined for your user !"
+#~ msgstr "No s'ha definit un empleat pel vostre usuari!"
+
+#, python-format
+#~ msgid "Mon"
+#~ msgstr "Dl"
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "Error d'usuari"
+
+#, python-format
+#~ msgid "No cost unit defined for this employee !"
+#~ msgstr "No s'ha definit una unitat de cost per aquest empleat!"
+
+#, python-format
+#~ msgid "ValidateError"
+#~ msgstr "Error de validació"
+
+#, python-format
+#~ msgid "Sat"
+#~ msgstr "Ds"
+
+#, python-format
+#~ msgid "Sun"
+#~ msgstr "Dg"
+
+#, python-format
+#~ msgid "July"
+#~ msgstr "Juliol"
+
+#, python-format
+#~ msgid "Tue"
+#~ msgstr "Dt"
+
+#, python-format
+#~ msgid "March"
+#~ msgstr "Març"
+
+#, python-format
+#~ msgid "September"
+#~ msgstr "Setembre"
+
+#, python-format
+#~ msgid "December"
+#~ msgstr "Desembre"
+
+#, python-format
+#~ msgid "Fri"
+#~ msgstr "Dv"
+
+#, python-format
+#~ msgid "August"
+#~ msgstr "Agost"
+
+#, python-format
+#~ msgid "June"
+#~ msgstr "Juny"
+
+#, python-format
+#~ msgid "November"
+#~ msgstr "Novembre"
+
+#, python-format
+#~ msgid "October"
+#~ msgstr "Octubre"
+
+#, python-format
+#~ msgid "January"
+#~ msgstr "Gener"
+
+#, python-format
+#~ msgid "May"
+#~ msgstr "Maig"
+
+#, python-format
+#~ msgid "February"
+#~ msgstr "Febrer"
+
+#, python-format
+#~ msgid "Thu"
+#~ msgstr "Dj"
+
+#, python-format
+#~ msgid "April"
+#~ msgstr "Abril"
+
+#, python-format
+#~ msgid "UnknownError"
+#~ msgstr "Error desconegut"
diff --git a/addons/hr_timesheet/i18n/zh_CN.po b/addons/hr_timesheet/i18n/zh_CN.po
index 99b35858250..cef640bdc73 100644
--- a/addons/hr_timesheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:29+0000\n"
+"PO-Revision-Date: 2010-07-21 03: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-06-22 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -26,7 +26,7 @@ msgstr "选择月份"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -53,7 +53,7 @@ msgstr "（留空表示当前时间）"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误:默认的计量单位和这货物的计量单位必须是同种类."
+msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
@@ -73,7 +73,7 @@ msgstr "当前日期"
 #. module: hr_timesheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名."
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: hr_timesheet
 #: wizard_button:hr.analytical.timesheet,init,report:0
@@ -85,7 +85,7 @@ msgstr "打印"
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr "最低辅助核算额"
+msgstr "最低辅助核算金额"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,server_date:0
@@ -113,7 +113,7 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
 msgid "Analytic Journal"
-msgstr "辅助核算分类帐"
+msgstr "辅助核算记录集合"
 
 #. module: hr_timesheet
 #: model:product.uom,name:hr_timesheet.uom_hour
@@ -129,7 +129,7 @@ msgstr "员工时间表"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr "统计完成的工作"
+msgstr "完成工作的统计"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
@@ -156,8 +156,6 @@ msgid "juillet"
 msgstr ""
 
 #. module: hr_timesheet
-#: xsl:hr.analytical.timesheet:0
-#: xsl:hr.analytical.timesheet_users:0
 #: model:ir.ui.menu,name:hr_timesheet.next_id_48
 msgid "Timesheet"
 msgstr "时间表"
@@ -239,7 +237,7 @@ msgstr "辅助核算明细"
 #. module: hr_timesheet
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误:销售单位必须和计量单位在不同的分类"
+msgstr "错误:销售单位必须和计量单位在不同的分类."
 
 #. module: hr_timesheet
 #: wizard_view:hr.analytical.timesheet_users,init:0
@@ -256,12 +254,12 @@ msgstr ""
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "Sign in / Sign out"
-msgstr "签入/签出"
+msgstr "签入/ 签出"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "Work done in the last period"
-msgstr "在最近会计期间完成的工作"
+msgstr "最近完成的工作"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -389,7 +387,7 @@ msgstr "月"
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算科目"
+msgstr "辅助核算项"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
@@ -399,12 +397,12 @@ msgstr "一般信息"
 #. module: hr_timesheet
 #: model:process.process,name:hr_timesheet.process_process_timesheetprocess0
 msgid "Timesheet Process"
-msgstr ""
+msgstr "时间表进程"
 
 #. module: hr_timesheet
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "错误:无效的EAN编码"
+msgstr "错误:无效EAN编码"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -446,7 +444,7 @@ msgstr "用户"
 #. module: hr_timesheet
 #: model:product.uom.categ,name:hr_timesheet.uom_categ_wtime
 msgid "Working Time"
-msgstr "工作的时间"
+msgstr "工作时间"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index 2b5a924805a..43143e4e324 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -1,9 +1,9 @@
-- |
-  In order to test hr_timesheet Module in OpenERP, I make "Sign In or Sign Out for Project" to encode and
-  track  time spent on the different projects.
+-
+  In order to test hr_timesheet Module in OpenERP, I make "Sign In/Sign Out for Project" to encode and
+  track time spent on the different projects.
 
-- |
-  Now, I  create a new employee “Mark Johnson” to test Timesheet.
+-
+  I  create a new employee “Mark Johnson” to test Timesheet.
 -
   !record {model: hr.employee, id: hr_employee_employee0}:
     address_home_id: base.res_partner_address_1
@@ -13,8 +13,8 @@
     name: Mark Johnson
     user_id: base.user_root
 
-- |
-  I create new user "user1" which is assigned to employee.
+-
+  I create new user "user1".
 -
   !record {model: res.users, id: res_users_user0}:
     company_id: base.main_company
@@ -29,8 +29,8 @@
     name: user1
     password: user1
 
-- |
-  I create another employee "Francline" as "user1".
+-
+  I create another new employee "Francline" as "user1".
 -
   !record {model: hr.employee, id: hr_employee_fracline1}:
     address_home_id: base.res_partner_address_8
@@ -38,16 +38,16 @@
     parent_id: 'hr_employee_employee0'
     user_id: 'res_users_user0'
 
-- |
-  Given that I have Timesheet journal for employee.
+-
+  I create Timesheet journal for employee.
 -
   !record {model: account.analytic.journal, id: analytic_journal}:
     code: TS
     name: Timesheet Journal
     type: general
 
-- |
-  Given that I have product for "Consultancy - Senior Developer".
+-
+  I create a product as "Consultancy - Senior Developer".
 -
   !record {model: product.product, id: product_consultant}:
     categ_id: product.product_category_10
@@ -62,42 +62,41 @@
     uom_id: product.uom_hour
     uom_po_id: product.uom_hour
 
-- |
-  I assing product and journal to  "Mark Johnson"
+-
+  I assigned product and journal to  "Mark Johnson"
 -
   !record {model: hr.employee, id: hr_employee_employee0}:
     product_id: product_consultant
     journal_id: analytic_journal
-- |
-  And also assing product and journal to "francline" employee.
+-
+  I assigned product and journal to "Francline".
 -
   !record {model: hr.employee, id: hr_employee_fracline1}:
     product_id: product_consultant
     journal_id: analytic_journal
-- |
-  Now , When I  came in office , I create Attendances and perform "Sign In" action with proper reason.
+-
+  I create attendance and perform "Sign In" action with proper reason.
 -
   !record {model: hr.attendance, id: hr_attendance_0}:
     action: sign_in
     employee_id: 'hr_employee_fracline1'
     name: '2010-05-26 10:08:08'
 
-- |
-  When I left office , I create attendance and perform "Sign Out".
+-
+  I create attendance and perform "Sign Out" action.
 -
   !record {model: hr.attendance, id: hr_attendance_1}:
     action: sign_out
     employee_id: 'hr_employee_fracline1'
     name: '2010-05-26 15:10:55'
 
-
-- |
-  I start by "Sign In/Sign Out by Project" wizard and click on "Sign In/Sign Out" button of this wizard.
+-
+  On "Sign In/Sign Out by Project" wizard i click on "Sign In/Sign Out" button of this wizard.
 -
   !python {model: hr.sign.in.project}: |
     uid = ref('res_users_user0')
     self.check_state(cr, uid, [ref("hr_employee_fracline1")], {"active_ids": [ref("hr_timesheet.menu_hr_timesheet_sign_in")]})
-- |
+-
   I select start date and Perform start work on project.
 -
   !python {model: hr.sign.in.project}: |
@@ -105,8 +104,8 @@
       new_id = self.create(cr, uid, {'emp_id': 'hr_employee_fracline1', 'name': 'Francline', 'server_date': '2010-06-08 19:50:54', 'state': 'absent'})
       self.sign_in_result(cr, uid, [new_id], context)
 
-- |
-  My work is done and I want to stop work.for that I click on  "Sign In/Sign Out" button of "Sign In/Sign Out by Project" wizard.
+-
+  To stop work I click on "Sign In/Sign Out" button of "Sign In/Sign Out by Project" wizard.
   Which check state in hr attendace form for user.
 -
   !python {model: hr.sign.in.project}: |
@@ -115,11 +114,9 @@
        self.check_state(cr, uid, ids, {"active_ids": [ref("hr_timesheet.menu_hr_timesheet_sign_in")]
              })
 
-- |
-  This will Open "hr sign out project" form. I select analytical project2 development account.
-- 
-  For that I Creating a analytic account.
-- 
+-
+  I Create an analytic account "Project2".
+-
   !record {model: account.analytic.account, id: account_analytic_account_project0}:
     company_id: base.main_company
     name: Project2
@@ -127,8 +124,8 @@
     quantity_max: 0.0
     state: open
 
-- |
-  My work for this project is over and I stop work by click on "Stop Work" button of this wizard.
+- 
+  My work for this project is over and I stop working by clicking on "Stop Work" button of this wizard.
 -
   !python {model: hr.sign.out.project}: |
        import time
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index d2e9a54f836..4bcdb614e2f 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -33,6 +33,8 @@ class analytical_timesheet_employee(osv.osv_memory):
                 }
 
     def _get_user(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         return uid
 
     _defaults = {
@@ -42,6 +44,8 @@ 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': [],
@@ -54,4 +58,5 @@ class analytical_timesheet_employee(osv.osv_memory):
             'datas': datas,
             }
 analytical_timesheet_employee()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index b895ace8a60..98c48e3e124 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -69,10 +69,10 @@
            <field name="target">new</field>
         </record>
 
-        <menuitem action="action_hr_timesheet_my"
+        <!--menuitem action="action_hr_timesheet_my"
         	id="menu_hr_timesheet_my"
         	parent="menu_hr_reporting_timesheet"
-        	groups="hr.group_hr_user" sequence="4" icon="STOCK_PRINT"/>
+        	groups="hr.group_hr_user" sequence="4" icon="STOCK_PRINT"/-->
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
index f7358eca990..27533710f35 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -39,6 +39,8 @@ 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': [],
@@ -49,7 +51,6 @@ class analytical_timesheet_employees(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'hr.analytical.timesheet_users',
             'datas': datas,
-            'nodestroy':True
             }
 
 analytical_timesheet_employees()
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 58bd24680dd..47645ce11c3 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -33,31 +33,37 @@ class hr_so_project(osv.osv_memory):
         'date': fields.datetime('Closing Date'),
         'analytic_amount': fields.float('Minimum Analytic Amount'),
         'name': fields.char('Employees name', size=32, required=True, readonly=True),
-        'state': fields.char('Current state', size=32, required=True, readonly=True),
+#        'state': fields.char('Current state', size=32, required=True, readonly=True),
+        'state': fields.related('emp_id', 'state', string='Current state', type='char', required=True, readonly=True),
         'server_date': fields.datetime('Current Date', required=True, readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')
                 }
-    
+
     def _get_empid(self, cr, uid, context=None):
         emp_obj = self.pool.get('hr.employee')
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
-        if emp_id:
-            for employee in emp_obj.browse(cr, uid, emp_id):
-                return {'name': employee.name, 'state': employee.state, 'emp_id': emp_id[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')}
+        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):
-        
-        res = self._get_empid(cr, uid, context)
+    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'],))
-                
+
         res['server_date'] = time.strftime('%Y-%m-%d %H:%M:%S')
         date_start = cr.fetchone()
-               
+
         if date_start:
             res['date_start'] = date_start[0]
         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
@@ -65,41 +71,44 @@ class hr_so_project(osv.osv_memory):
     def _write(self, cr, uid, data, emp_id, context=None):
         timesheet_obj = self.pool.get('hr.analytic.timesheet')
         emp_obj = self.pool.get('hr.employee')
+        if context is None:
+            context = {}
         hour = (time.mktime(time.strptime(data['date'] or time.strftime('%Y-%m-%d %H:%M:%S'), '%Y-%m-%d %H:%M:%S')) -
             time.mktime(time.strptime(data['date_start'], '%Y-%m-%d %H:%M:%S'))) / 3600.0
         minimum = data['analytic_amount']
         if minimum:
             hour = round(round((hour + minimum / 2) / minimum) * minimum, 2)
-        res = timesheet_obj.default_get(cr, uid, ['product_id','product_uom_id'])
-        
+        res = timesheet_obj.default_get(cr, uid, ['product_id','product_uom_id'], context=context)
+
         if not res['product_uom_id']:
             raise osv.except_osv(_('UserError'), _('No cost unit defined for this employee !'))
         up = timesheet_obj.on_change_unit_amount(cr, uid, False, res['product_id'], hour, res['product_uom_id'])['value']
-        
+
         res['name'] = data['info']
         res['account_id'] = data['account_id'].id
         res['unit_amount'] = hour
-        emp_journal = emp_obj.browse(cr, uid, emp_id, context).journal_id
+        emp_journal = emp_obj.browse(cr, uid, emp_id, context=context).journal_id
         res['journal_id'] = emp_journal and emp_journal.id or False
         res.update(up)
         up = timesheet_obj.on_change_account_id(cr, uid, [], res['account_id']).get('value', {})
         res.update(up)
         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): 
+        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_out',dt=data.date)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], type='sign_out', dt=data.date)
             self._write(cr, uid, data, emp_id, context=context)
         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):
+        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='action', dt=data.date)
             self._write(cr, uid, data, emp_id, context=context)
@@ -108,7 +117,7 @@ class hr_so_project(osv.osv_memory):
 hr_so_project()
 
 class hr_si_project(osv.osv_memory):
-    
+
     _name = 'hr.sign.in.project'
     _description = 'Sign In By Project'
     _columns = {
@@ -117,9 +126,9 @@ class hr_si_project(osv.osv_memory):
         'date': fields.datetime('Starting Date'),
         'server_date': fields.datetime('Current Date',  readonly=True),
        # 'emp_id': fields.char('Employee ID', size=512, required=False),
-        'emp_id': fields.many2one('hr.employee', 'Employee ID') 
+        'emp_id': fields.many2one('hr.employee', 'Employee ID')
                 }
-    
+
     def view_init(self, cr, uid, fields, context=None):
         """
         This function checks for precondition before wizard executes
@@ -130,22 +139,25 @@ class hr_si_project(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         """
         emp_obj = self.pool.get('hr.employee')
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
+        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 !'))
-        return False    
+        return False
 
     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,))
         res = (cr.fetchone() or ('sign_out',))[0]
         in_out = res == 'sign_out' and 'out' or 'in'
         #TODO: invert sign_in et sign_out
-        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_%s' % in_out)])
-        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_%s' % in_out)], context=context)
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         return {
             'name': 'Sign in / Sign out',
             'view_type': 'form',
@@ -156,20 +168,24 @@ class hr_si_project(osv.osv_memory):
             'target': 'new'
         }
 
-    def sign_in_result(self, cr, uid, ids, context):
+    def sign_in_result(self, cr, uid, ids, context=None):
         emp_obj = self.pool.get('hr.employee')
-        for data in self.browse(cr, uid, ids, context):
+        if context is None:
+            context = {}
+        for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
             success = emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data.date or False)
         return {}
 
     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)])
-        if emp_id: 
-            for employee in emp_obj.browse(cr, uid, emp_id):
-                res.update({'emp_id': employee.name, 'state': employee.state, 'emp_id': emp_id[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')})
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
+        if emp_id:
+            for employee in emp_obj.browse(cr, uid, emp_id, context=context):
+                res.update({'name': employee.name, 'state': employee.state, 'emp_id': emp_id[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
 hr_si_project()
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 099eb0d4642..18e5e4f11df 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -46,8 +46,9 @@
             <field name="res_model">hr.sign.in.project</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_hr_timesheet_sign_in_message"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_hr_timesheet_sign_in_message"/>
+            <field name="target">new</field>
+            <field name="help">Employees can encode their time spent on the different projects. A project is an analytic account and the time spent on a project generate costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet.</field>
         </record>
 
         <menuitem action="action_hr_timesheet_sign_in"
@@ -69,11 +70,13 @@
 					    <field name="date_start"/>
 					    <field name="server_date"/>
 					    <separator string="Work done in the last period" colspan="4" />
-					    <field name="account_id" colspan="3"/>
-					    <field name="info" colspan="3"/>
+					    <field name="account_id" colspan="2"/>
+					    <field name="info" colspan="2"/>
 					    <field name="date"/>
 					    <label string="(Keep empty for current_time)" colspan="2"/>
-					    <field name="analytic_amount"/>                	</group>
+					    <field name="analytic_amount"/>
+					</group>
+					<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     	<button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object"/>
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 0b96cc94974..f9be64cc454 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -28,7 +28,7 @@
 Module to generate invoices based on costs (human resources, expenses, ...).
 You can define price lists in analytic account, make some theoretical revenue
 reports, eso.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account', 'hr_timesheet'],
     'init_xml': [],
diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
index 0598ad79670..78945f73f4e 100644
--- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
+++ b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
@@ -2,8 +2,6 @@
 <openerp>
     <data>
 
-
-
         <act_window domain="[('state','&lt;&gt;','close'),('partner_id','&lt;&gt;',False),('to_invoice', '&lt;&gt;', False)]" id="act_my_account" name="Accounts to invoice" res_model="account.analytic.account" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
         <record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window">
@@ -16,26 +14,26 @@
         <record id="board_hr_timesheet_invoice_form" model="ir.ui.view">
             <field name="name">board.hr.timesheet.invoice</field>
             <field name="model">board.board</field>
- 			<field name="type">form</field>            
-			<field name="inherit_id" ref="account.board_account_form"/>              
+             <field name="type">form</field>
+            <field name="inherit_id" ref="account.board_account_form"/>
             <field name="arch" type="xml">
-	      		<xpath expr="/form/hpaned/child1/action[@string='Draft Customer Invoices']" position="before">     
-					<action colspan="4" height="160" name="%(hr_timesheet_invoice.action_analytic_account_tree)d" string="Analytic accounts to close" width="510"/>
-					<action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
-				</xpath>  
+                <xpath expr="/form/hpaned/child1/action[@string='Draft Customer Invoices']" position="before">
+                    <action colspan="4" height="160" name="%(hr_timesheet_invoice.action_analytic_account_tree)d" string="Analytic accounts to close" width="510"/>
+                    <action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
+                </xpath>
             </field>
         </record>
-        
-		<!-- Need to merge in above view -->
-		<record id="board_hr_timesheet_invoice_report_form1" model="ir.ui.view">
+
+        <!-- Need to merge in above view -->
+        <record id="board_hr_timesheet_invoice_report_form1" model="ir.ui.view">
             <field name="name">board.hr.timesheet.invoice</field>
             <field name="model">board.board</field>
- 			<field name="type">form</field>            
-			<field name="inherit_id" ref="account.board_account_form"/>              
+             <field name="type">form</field>
+            <field name="inherit_id" ref="account.board_account_form"/>
             <field name="arch" type="xml">
-	      		<xpath expr="/form/hpaned/child2/action[@string='Aged receivables']" position="before">          
-				<action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
-				</xpath>  
+                  <xpath expr="/form/hpaned/child2/action[@string='Aged income']" position="after">
+                <action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 2190a1c8149..730adebe049 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -39,13 +39,16 @@ hr_timesheet_invoice_factor()
 
 
 class account_analytic_account(osv.osv):
-    def _invoiced_calc(self, cr, uid, ids, name, arg, context={}):
+    def _invoiced_calc(self, cr, uid, ids, name, arg, context=None):
+        obj_invoice = self.pool.get('account.invoice')
+        if context is None:
+            context = {}
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             invoiced = {}
             cr.execute('select distinct(l.invoice_id) from hr_analytic_timesheet h left join account_analytic_line l on (h.line_id=l.id) where account_id=%s', (account.id,))
             invoice_ids = filter(None, map(lambda x: x[0], cr.fetchall()))
-            for invoice in self.pool.get('account.invoice').browse(cr, uid, invoice_ids, context):
+            for invoice in obj_invoice.browse(cr, uid, invoice_ids, context=context):
                 res.setdefault(account.id, 0.0)
                 res[account.id] += invoice.amount_untaxed
         for id in ids:
@@ -73,20 +76,24 @@ account_analytic_account()
 class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
     _columns = {
-        'invoice_id': fields.many2one('account.invoice', 'Invoice', ondelete="set null"),                
+        'invoice_id': fields.many2one('account.invoice', 'Invoice', ondelete="set null"),
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing'),
     }
 
     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):
-        self._check_inv(cr, uid, ids,vals)
+        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)
 
-    def _check_inv(self, cr, uid, ids,vals):
+    def _check_inv(self, cr, uid, ids, vals):
         select = ids
         if isinstance(select, (int, long)):
             select = [ids]
@@ -98,12 +105,14 @@ 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()
         default.update({'invoice_id': False})
         return super(account_analytic_line, self).copy(cursor, user, obj_id,
-                default, context)
+                default, context=context)
 
 account_analytic_line()
 
@@ -126,12 +135,14 @@ 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()
         default.update({'invoice_id': False})
         return super(hr_analytic_timesheet, self).copy(cursor, user, obj_id,
-                default, context)
+                default, context=context)
 
 hr_analytic_timesheet()
 
@@ -143,9 +154,10 @@ class account_invoice(osv.osv):
 
         inv = self.browse(cr, uid, [id])[0]
         if inv.type == 'in_invoice':
+            obj_analytic_account = self.pool.get('account.analytic.account')
             for il in iml:
                 if il['account_analytic_id']:
-                    to_invoice = self.pool.get('account.analytic.account').read(cr, uid, [il['account_analytic_id']], ['to_invoice'])[0]['to_invoice']
+                    to_invoice = obj_analytic_account.read(cr, uid, [il['account_analytic_id']], ['to_invoice'])[0]['to_invoice']
                     if to_invoice:
                         il['analytic_lines'][0][2]['to_invoice'] = to_invoice[0]
         return iml
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 70104c71ef5..877afa57965 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -84,7 +84,6 @@
         </record>
 
         <!-- Inherits for account analytic lines -->
-
         <record id="view_account_analytic_line_tree_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.tree.to_invoice</field>
             <field name="model">account.analytic.line</field>
@@ -110,6 +109,11 @@
         </record>
 
         <!-- Menus -->
+        <menuitem 
+            parent="account.menu_finance_periodical_processing" 
+            id="menu_finance_periodical_processing_billing" 
+            name="Billing"/>
+        
         <record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
             <field name="name">Entries to invoice</field>
             <field name="res_model">account.analytic.line</field>
@@ -117,12 +121,12 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('to_invoice','&lt;&gt;',False)]</field>
             <field name="context">{"search_default_user_id":uid}</field>
-     <!--   <field name="search_view_id" ref="account.view_account_analytic_account_search"/> -->
+            <field name="help">OpenERP automatically group the entries to be invoiced so you can keep an eye on them on real time in one glance.</field>
         </record>
         <menuitem
             action="action_hr_analytic_timesheet_open_tree"
             id="menu_hr_analytic_timesheet_tree"
-            parent="account.menu_finance_periodical_processing"/>
+            parent="menu_finance_periodical_processing_billing"/>
 
         <record id="action_hr_analytic_timesheet_tree_invoiced" model="ir.actions.act_window">
             <field name="name">Uninvoiced Entries</field>
@@ -183,7 +187,7 @@
         <menuitem
             action="action_hr_timesheet_invoice_factor_form"
             id="hr_timesheet_invoice_factor_view"
-            parent="account.account_analytic_def_account"/>
+            parent="account.menu_low_level"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/i18n/ro.po b/addons/hr_timesheet_invoice/i18n/ro.po
index 1f12bb1fe06..211c37809ca 100644
--- a/addons/hr_timesheet_invoice/i18n/ro.po
+++ b/addons/hr_timesheet_invoice/i18n/ro.po
@@ -1,30 +1,30 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* hr_timesheet_invoice
+#	* hr_timesheet_invoice
 #
 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"
-"PO-Revision-Date: 2009-09-08 14:49+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2010-07-23 20:20+0000\n"
+"Last-Translator: Desen <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-06-22 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-07-24 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
 msgid "Type of invoicing"
-msgstr ""
+msgstr "Tip de facturare"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Profit"
-msgstr ""
+msgstr "Profit"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
@@ -39,17 +39,17 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Income"
-msgstr ""
+msgstr "Venituri"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,customer_name:0
 msgid "Visible name"
-msgstr ""
+msgstr "Nume vizibil"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date1:0
 msgid "Start of period"
-msgstr ""
+msgstr "Începutul perioadei"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,price:0
@@ -57,11 +57,13 @@ msgid ""
 "The cost of each work done will be displayed on the invoice. You probably "
 "don't want to check this."
 msgstr ""
+"Costul fiecărei activități efectuate va fi tipărit pe factura. Probabil că "
+"nu doriți să bifați această opțiune."
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_invoice_create
 msgid "Invoice analytic lines"
-msgstr ""
+msgstr "Detalii factură"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,time:0
@@ -72,18 +74,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_draft_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_draft_analytic_accounts
 msgid "Draft Analytic Accounts"
-msgstr ""
+msgstr "Conturi analitice în schiță"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,time:0
 #: wizard_field:hr.timesheet.invoice.create,init,time:0
 msgid "Time spent"
-msgstr ""
+msgstr "Timp consumat"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_invoiced:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "Valoarea Facturată"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,to_invoice:0
diff --git a/addons/hr_timesheet_invoice/i18n/sl.po b/addons/hr_timesheet_invoice/i18n/sl.po
index b2b2f8cc19e..387535c1a36 100644
--- a/addons/hr_timesheet_invoice/i18n/sl.po
+++ b/addons/hr_timesheet_invoice/i18n/sl.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* hr_timesheet_invoice
+#	* hr_timesheet_invoice
 #
 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"
-"PO-Revision-Date: 2010-01-27 14:46+0000\n"
+"PO-Revision-Date: 2010-07-28 12:25+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-06-22 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
@@ -157,7 +157,7 @@ msgstr "Izberite"
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Debit"
-msgstr "V breme"
+msgstr "Breme"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:account.analytic.profit,init,report:0
@@ -490,119 +490,119 @@ msgstr "Strošek"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
 msgid "Analytic account to close"
-msgstr "Zapreti analitični konto"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,quantity_max:0
 msgid "Max. Quantity"
-msgstr "Najv. količina"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,name:0
 msgid "Analytic account"
-msgstr "Analitični konto"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,state:0
 msgid "State"
-msgstr "Stanje"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,date_deadline:0
 msgid "Deadline"
-msgstr "Rok"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
 msgid "Analytic Account Reporting"
-msgstr "Poročanje po analitičnih kontih"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
-msgstr "Partner"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
 #: view:report.analytic.account.close:0
 msgid "Expired analytic accounts"
-msgstr "Neveljavni analitični konti"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,quantity:0
 msgid "Quantity"
-msgstr "Količina"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
 msgid "Lines to Invoice"
-msgstr "Vrstice za fakturiranje"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
 #: view:report.account.analytic.line.to.invoice:0
 msgid "Analytic Lines to Invoice"
-msgstr "Analitične vrstice za fakturiranje"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,sale_price:0
 msgid "Sale price"
-msgstr "Prodajna cena"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
 msgid "Analytic lines - Reporting"
-msgstr "Analitične vrstice - Poročanje"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,name:0
 msgid "Month"
-msgstr "Mesec"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,amount:0
 msgid "Amount"
-msgstr "Znesek"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
 msgid "Analytic lines to invoice report"
-msgstr "Analitične vrstice za poročilo fakturiranja"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,product_uom_id:0
 msgid "UoM"
-msgstr "ME"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
 #: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
 msgid "My daily timesheets by account"
-msgstr "Moje dnevne časovnice po strankah"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.user:0
 msgid "Timesheet by user"
-msgstr "Časovnice po uporabnikih"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
 #: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
 msgid "Timesheet by Account"
-msgstr "Časovnice po kontih"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account:0
 msgid "Timesheet by account"
-msgstr "Časovnice po kontih"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
 #: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
-msgstr "Zaračunavanje stroškov"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
@@ -619,54 +619,54 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
 msgid "Timesheets"
-msgstr "Časovnice"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
 msgid "Timesheets per account"
-msgstr "Časovnice po strankah"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
 msgid "Timesheets to invoice"
-msgstr "Zaračunavanje po časovnicah"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
-msgstr "Časovnice po dneh"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
 #: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
 msgid "Daily Timesheet by Account"
-msgstr "Dnevna časovnica po stranki"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
 msgid "Description"
-msgstr "Opis"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
 #: view:report_timesheet.account:0
 msgid "Timesheet per account"
-msgstr "Časovnica po stranki"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
 msgid "Timesheet - Reporting"
-msgstr "Časovnice - poročanje"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
 msgid "Timesheet by invoice"
-msgstr "Časovnica po računu"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
 msgid "This Month"
-msgstr "Ta mesec"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
@@ -687,7 +687,7 @@ msgstr ""
 #: field:report_timesheet.invoice,user_id:0
 #: field:report_timesheet.user,user_id:0
 msgid "User"
-msgstr "Uporabnik"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: view:report.random.timesheet:0
@@ -707,12 +707,12 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,account_id:0
 msgid "Project"
-msgstr "Projekt"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,amount_invoice:0
 msgid "To invoice"
-msgstr "Za zaračunavanje"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
@@ -724,7 +724,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
 #: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
 msgid "Timesheet by Invoice"
-msgstr "Časovnica po računu"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
@@ -734,7 +734,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:random.timesheet.lines,general_account_id:0
 msgid "General Account"
-msgstr "Splošni konto"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
@@ -766,12 +766,12 @@ msgstr ""
 #: field:report_timesheet.account,account_id:0
 #: field:report_timesheet.account.date,account_id:0
 msgid "Analytic Account"
-msgstr "Analitični konto"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,manager_id:0
 msgid "Manager"
-msgstr "Upravitelj"
+msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
diff --git a/addons/hr_timesheet_invoice/i18n/zh_CN.po b/addons/hr_timesheet_invoice/i18n/zh_CN.po
index 67162b3ba0c..41f5aea151a 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_CN.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_CN.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* hr_timesheet_invoice
+#	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:29+0000\n"
+"PO-Revision-Date: 2010-07-21 06:01+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-06-22 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
@@ -34,7 +34,7 @@ msgstr "强制使用特定产品"
 #. module: hr_timesheet_invoice
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -49,14 +49,14 @@ msgstr "可见的名称"
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date1:0
 msgid "Start of period"
-msgstr "期初日期"
+msgstr "开始会计期间"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,price:0
 msgid ""
 "The cost of each work done will be displayed on the invoice. You probably "
 "don't want to check this."
-msgstr "每个工作的成本将显示在发票上.你可能不想检查它"
+msgstr "每个完成工作的成本将显示在发票上. 你可能不想核对它"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_invoice_create
@@ -72,7 +72,7 @@ msgstr "显示时间在工作日志"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_draft_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_draft_analytic_accounts
 msgid "Draft Analytic Accounts"
-msgstr "辅助核算项目草稿"
+msgstr "辅助核算项草稿"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,time:0
@@ -83,7 +83,7 @@ msgstr "花费的时间"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_invoiced:0
 msgid "Invoiced Amount"
-msgstr "开发票金额"
+msgstr "已开票金额"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,to_invoice:0
@@ -91,24 +91,22 @@ msgid ""
 "Check this field if you plan to automatically generate invoices based on the "
 "costs in this analytic account: timesheets, expenses, ...You can configure "
 "an automatic invoice rate on analytic accounts."
-msgstr ""
-"如果你计划自动生成发票基于成本在辅助核算项目:时间表、费用....选择这字段你能设"
-"定自动发票的辅助核算项目"
+msgstr "勾选此项, 如果你打算根据在辅助核算项目:时间表、费用....的花费自动生成发票. 你能设定辅助核算项的花费生成发票."
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,name:0
 msgid "The detail of each work done will be displayed on the invoice"
-msgstr "每个工作的详情将显示在发票上"
+msgstr "每个完成工作的细节将显示在发票上"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init:0
 msgid "Select period"
-msgstr "销售周期"
+msgstr "选择会计期间"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Period to enddate"
-msgstr "周期的结束日期"
+msgstr "会计期间的结束日期"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:hr.timesheet.invoice.create,init,create:0
@@ -118,12 +116,12 @@ msgstr "创建发票"
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Period from startdate"
-msgstr "周期的开始日期"
+msgstr "会计期间的开始日期"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,time:0
 msgid "The time of each work done will be displayed on the invoice"
-msgstr "每个工作完成的时间将显示在发票上"
+msgstr "每个完成工作的时间将显示在发票上"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,balance_product:0
@@ -143,13 +141,13 @@ msgstr "你想看详情每一发票行?"
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Date or Code"
-msgstr "日期代码"
+msgstr "日期或者代码"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
 msgid "Entries to invoice"
-msgstr "凭证开发票"
+msgstr "分录开发票"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:account.analytic.profit,init:0
@@ -171,7 +169,7 @@ msgstr "打印"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_open_analytic_accounts
 msgid "Open Analytic Accounts"
-msgstr "待处理辅助核算项目"
+msgstr "待处理辅助核算项"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
@@ -193,12 +191,12 @@ msgstr "销售价格表"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,name:0
 msgid "Display detail of work in the invoice line."
-msgstr "显示发票行的工作详情"
+msgstr "显示发票行的工作细节"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "J.C. or Move name"
-msgstr "成本分类账或凭证名称"
+msgstr "成本分录集合或凭证名称"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -208,7 +206,7 @@ msgstr "打印日期"
 #. module: hr_timesheet_invoice
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -225,18 +223,18 @@ msgstr "理论"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced_my
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced_my
 msgid "My Uninvoiced Entries"
-msgstr "我未开票项目"
+msgstr "未开发票条目"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,name:0
 #: wizard_field:hr.timesheet.invoice.create,init,name:0
 msgid "Name of entry"
-msgstr "凭证名称"
+msgstr "条目名称"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Employee or Journal Name"
-msgstr "员工或分类帐名称"
+msgstr "员工或记录集合名称"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -248,7 +246,7 @@ msgstr "货币"
 msgid ""
 "Complete this field only if you want to force to use a specific product. "
 "Keep empty to use the real product that comes from the cost."
-msgstr "如果你想强制使用特定的产品只有完成这字段如果留空使用实际产品来自成本"
+msgstr "如果你想强制使用特定的产品只有填入该字段.  留空使用来自成本的实际产品"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced
@@ -289,7 +287,7 @@ msgstr "状态"
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Period to"
-msgstr "周期到"
+msgstr "会计期间到"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,balance_product:0
@@ -306,7 +304,7 @@ msgstr "成本分类账"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,date:0
 msgid "Display date in the history of works"
-msgstr "显示这工作的日志日期"
+msgstr "在这工作日志显示日期"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,date:0
@@ -327,7 +325,7 @@ msgstr "有效"
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.create,init,accounts:0
 msgid "Analytic Accounts"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -342,12 +340,12 @@ msgstr "贷方"
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date2:0
 msgid "End of period"
-msgstr "周期结束日期"
+msgstr "会计期间结束"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Balance"
-msgstr "结余"
+msgstr "差额"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
@@ -372,7 +370,7 @@ msgstr "你想显示这工作发票的详细资料"
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Period from"
-msgstr "周期从"
+msgstr "会计期间从"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_max:0
@@ -416,7 +414,7 @@ msgstr "显示这项成本在你再开的发票"
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Choose accounts you want to invoice"
-msgstr "选择你想要开发票的科目"
+msgstr "选择你想要开发票的帐目"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.create,init,product:0
@@ -426,7 +424,7 @@ msgstr "产品"
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,name:0
@@ -436,7 +434,7 @@ msgstr "内部名称"
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,journal_ids:0
 msgid "Journal"
-msgstr "分类帐"
+msgstr "记录集合"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -446,13 +444,13 @@ msgstr "单位"
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
 msgid "Invoice on analytic lines"
-msgstr "辅助核算的发票"
+msgstr "辅助核算明细的发票"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_pending_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_pending_analytic_accounts
 msgid "Pending Analytic Accounts"
-msgstr "未决的辅助核算项目"
+msgstr "未决的辅助核算项"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
@@ -473,7 +471,7 @@ msgstr "发票类型"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,to_invoice:0
 msgid "Invoicing"
-msgstr "计价折扣"
+msgstr "开发票"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_invoice_analytic_accounts
@@ -511,7 +509,7 @@ msgstr "状态"
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,date_deadline:0
 msgid "Deadline"
-msgstr "截止期限"
+msgstr "截止日期"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
@@ -538,7 +536,7 @@ msgstr "数量"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
 msgid "Lines to Invoice"
-msgstr "辅助核算开发票"
+msgstr "开发票"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
@@ -560,7 +558,7 @@ msgstr "辅助核算 - 报表"
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,name:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,amount:0
@@ -581,7 +579,7 @@ msgstr "计量单位"
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
 #: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
 msgid "My daily timesheets by account"
-msgstr "我的科目每天时间表"
+msgstr "按科目(项)我的每天时间表"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.user:0
@@ -592,18 +590,18 @@ msgstr "用户时间表"
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
 #: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
 msgid "Timesheet by Account"
-msgstr "科目时间表"
+msgstr "科目(项)时间表"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account:0
 msgid "Timesheet by account"
-msgstr "科目时间表"
+msgstr "科目(项)时间表"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
 #: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
-msgstr "成本开发票"
+msgstr "成本发票"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
@@ -625,12 +623,12 @@ msgstr "时间表"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
 msgid "Timesheets per account"
-msgstr "每科目时间表"
+msgstr "每科目(项)时间表"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
 msgid "Timesheets to invoice"
-msgstr "时间表开发票"
+msgstr "时间表发票"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
@@ -641,7 +639,7 @@ msgstr "每天时间表"
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
 #: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
 msgid "Daily Timesheet by Account"
-msgstr "科目每日时间表"
+msgstr "科目(项)每日时间表"
 
 #. module: hr_timesheet_invoice
 #: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
@@ -652,7 +650,7 @@ msgstr "说明"
 #: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
 #: view:report_timesheet.account:0
 msgid "Timesheet per account"
-msgstr "每科目时间表"
+msgstr "每科目(项)时间表"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
@@ -667,13 +665,13 @@ msgstr "发票时间表"
 #. module: hr_timesheet_invoice
 #: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
 msgid "This Month"
-msgstr "本月"
+msgstr "这月"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
 #: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
 msgid "My timesheets by account"
-msgstr "我的科目时间表"
+msgstr "我的科目(项)时间表"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
@@ -698,7 +696,7 @@ msgstr "任意时间表"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet by account"
-msgstr "科目每日时间表"
+msgstr "科目(项)每日时间表"
 
 #. module: hr_timesheet_invoice
 #: view:random.timesheet.lines:0
@@ -746,20 +744,20 @@ msgstr "每天时间表"
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
 #: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
 msgid "My timesheets to invoice"
-msgstr "我的时间表开发票"
+msgstr "我的时间表发票"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet per account"
-msgstr "科目每日时间表"
+msgstr "科目(项)每日时间表"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,description:report_timesheet.module_meta_information
 msgid ""
 "Module to add timesheet views like\n"
 "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-msgstr "模块增加时间表视图如:所有月份,用户时间表,月度时间表,科目时间表"
+msgstr "模块增加时间表视图如: 所有月份, 用户时间表, 月度时间表, 科目时间表"
 
 #. module: hr_timesheet_invoice
 #: field:random.timesheet.lines,analytic_account_id:0
@@ -767,12 +765,12 @@ msgstr "模块增加时间表视图如:所有月份,用户时间表,月度时间
 #: field:report_timesheet.account,account_id:0
 #: field:report_timesheet.account.date,account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,manager_id:0
 msgid "Manager"
-msgstr "管理者"
+msgstr "经理"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
@@ -782,8 +780,8 @@ msgstr "用户时间表(这月)"
 
 #~ msgid ""
 #~ "\n"
-#~ "Module to generate invoices based on costs (human resources, "
-#~ "expenses, ...).\n"
+#~ "Module to generate invoices based on costs (human resources, expenses, "
+#~ "...).\n"
 #~ "You can define price lists in analytic account, make some theoretical "
 #~ "revenue\n"
 #~ "reports, eso."
@@ -794,9 +792,3 @@ msgstr "用户时间表(这月)"
 
 #~ msgid "Invoice on analytic entries"
 #~ msgstr "辅助核算凭证发票"
-
-#~ msgid "A report on analytic lines, costs by products, months and accounts."
-#~ msgstr "辅助核算明细的报表:产品成本,月度和科目"
-
-#~ msgid "All Months"
-#~ msgstr "所有月份"
diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.py b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
index c9873f07f18..8b6cd7f9fbd 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -34,8 +34,7 @@ class account_analytic_profit(report_sxw.rml_parse):
     def _user_ids(self, lines):
         user_obj=pooler.get_pool(self.cr.dbname).get('res.users')
         ids=list(set([b.user_id.id for b in lines]))
-        res=user_obj.browse(self.cr, self.uid, ids)
-        return res
+        return user_obj.browse(self.cr, self.uid, ids)
 
     def _journal_ids(self, form, user_id):
         line_obj=pooler.get_pool(self.cr.dbname).get('account.analytic.line')
@@ -47,8 +46,7 @@ class account_analytic_profit(report_sxw.rml_parse):
             ('user_id', '=', user_id),
             ])
         ids=list(set([b.journal_id.id for b in line_obj.browse(self.cr, self.uid, line_ids)]))
-        res=journal_obj.browse(self.cr, self.uid, ids)
-        return res
+        return journal_obj.browse(self.cr, self.uid, ids)
 
     def _line(self, form, journal_ids, user_ids):
         pool=pooler.get_pool(self.cr.dbname)
@@ -103,12 +101,11 @@ class account_analytic_profit(report_sxw.rml_parse):
                     res[id]['amount'] += xxx
             else:
                 res[id]['amount'] += xxx
-
             res[id]['cost']+=line.amount
             res[id]['unit_amount']+=line.unit_amount
         for id in res:
             res[id]['profit']=res[id]['amount']+res[id]['cost']
-            res[id]['eff']='%d' % (-res[id]['amount'] / res[id]['cost'] * 100,)
+            res[id]['eff']=res[id]['cost'] and '%d' % (-res[id]['amount'] / res[id]['cost'] * 100,) or 0.0
         return res.values()
 
     def _lines(self, form):
@@ -119,10 +116,8 @@ class account_analytic_profit(report_sxw.rml_parse):
             ('journal_id', 'in', form['journal_ids'][0][2]),
             ('user_id', 'in', form['employee_ids'][0][2]),
             ])
-        res=line_obj.browse(self.cr, self.uid, ids)
-        return res
+        return line_obj.browse(self.cr, self.uid, ids)
 
 report_sxw.report_sxw('report.account.analytic.profit', 'account.analytic.line', 'addons/hr_timesheet_invoice/report/account_analytic_profit.rml', parser=account_analytic_profit)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
index b7cf2e8a2df..09d6275ede2 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
@@ -254,9 +254,9 @@ class report_random_timsheet(osv.osv):
                 line.id as id, line.account_id as analytic_account_id, line.name as name,
                 line.unit_amount as quantity, line.date as date, line.user_id as user_id
             from
-                account_analytic_line line, hr_department dept,hr_department_user_rel dept_user
+                account_analytic_line line, hr_department dept,hr_employee dept_user
             where
-                (dept.id = dept_user.department_id AND dept_user.user_id=line.user_id AND line.user_id is not null)
+                (dept.id = dept_user.department_id AND dept_user.id=line.user_id AND line.user_id is not null)
                 AND (dept.manager_id = """ + str(uid) + """ )
                 AND (line.date <= CURRENT_DATE AND line.date > (CURRENT_DATE-3))
             LIMIT 10
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 58215a087b7..cbdef2a28ba 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -81,7 +81,7 @@
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended options..." colspan="10" col="12">
+                    <group expand="0" string="Extended Filters..." colspan="10" col="12">
                         <field name="date"/>
                         <separator orientation="vertical"/>
                         <field name="invoice_id" widget="selection"/>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index 7d24e8c26ec..de46463bb12 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -57,8 +57,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="domain">[('state','=','open')]</field>
         </record>
-        <menuitem action="action_analytic_account_tree" id="menu_action_analytic_account_tree" parent="account.next_id_40"/>
-
+<!--        <menuitem action="action_analytic_account_tree" id="menu_action_analytic_account_tree" parent="account.next_id_40"/>-->
 
         <record id="account_analytic_line_to_invoice_view_form" model="ir.ui.view">
             <field name="name">report.account.analytic.line.to.invoice</field>
@@ -109,20 +108,20 @@
             </field>
         </record>
 
-		<record id="account_analytic_line_to_invoice_view_filter" model="ir.ui.view">
+        <record id="account_analytic_line_to_invoice_view_filter" model="ir.ui.view">
             <field name="name">report.account.analytic.line.to.invoice.select</field>
             <field name="model">report.account.analytic.line.to.invoice</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                    <group col="12" colspan="4">
-                   		<filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
-						<filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
-						<separator orientation="vertical"/>
-						<field name="name" select="1"/>
-						<field name="month" select="1"/>
-	                    <field name="product_id" select="1"/>
-	                    <field name="account_id" select="1"/>
+                        <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
+                        <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="month" select="1"/>
+                        <field name="product_id" select="1"/>
+                        <field name="account_id" select="1"/>
                    </group>
                </search>
             </field>
@@ -135,7 +134,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="account_analytic_line_to_invoice_view_filter"/>
         </record>
-        <menuitem action="action_account_analytic_line_to_invoice" id="account_analytic_lines_to_invoice_report" parent="account.next_id_40"/>
+<!--        <menuitem action="action_account_analytic_line_to_invoice" id="account_analytic_lines_to_invoice_report" parent="account.next_id_40"/>-->
 
         <act_window domain="[('account_id', '=', active_id),('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" name="Lines to Invoice" res_model="account.analytic.line" src_model="account.analytic.account"/>
 
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index 431c30d8cb1..51d507f1df0 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -1,8 +1,8 @@
-- |
+-
   In order to test hr_timesheet_invoice in OpenERP, I create account line to manage invoice based on costs.
-- |
-  In order to test flow, I create analytic line for sednacom analytic account.  
-- 
+-
+  I create an account analytic line.
+-
   !record {model: account.analytic.line, id: account_analytic_line_developyamlforhrmodule0}:
     account_id: account.analytic_sednacom
     amount: -1.0
@@ -17,17 +17,16 @@
     unit_amount: 5.00
     user_id: base.user_root
 
-- |
-  Give partner name and price list in analytic account. 
-- 
+-
+  Assign partner name and price list in analytic account.
+-
   !record {model: account.analytic.account, id: account.analytic_sednacom}:
     partner_id: base.res_partner_9
     pricelist_id: product.list0
-    
-- |
+
+-
   I create invoice on analytic Line using "Invoice analytic Line" wizard.
-  Give date , detail of each work , time spend on that work on this wizard.
-- 
+-
   !record {model: hr.timesheet.invoice.create, id: hr_timesheet_invoice_create_0}:
     accounts:
       - account.analytic_sednacom
@@ -36,54 +35,50 @@
     price: 1
     product: hr_timesheet.product_consultant
     time: 1
-    
-- | 
+
+-
   I click on "Create Invoice" button of "Invoice analytic Line" wizard to create invoice.
-- 
+-
   !python {model: hr.timesheet.invoice.create}: |
     self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_0")], {"active_ids": [ref("hr_timesheet_invoice.account_analytic_line_developyamlforhrmodule0")]})
-    
-- |
-  I check that Invoice is create for this timesheet.    
+
+-
+  I check that Invoice is created for this timesheet.
 -
   !python {model: account.analytic.line}: |
     exp = self.browse(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')])[0]
-    
     analytic_account_obj = self.pool.get('account.analytic.account')
-    
     data = self.pool.get('hr.timesheet.invoice.create').read(cr, uid, [ref("hr_timesheet_invoice_create_0")], [], context)[0]
-    
     account_ids = data['accounts']
     for account in analytic_account_obj.browse(cr, uid, account_ids, context):
             partner = account.partner_id.id
-    
+
     invoice_obj = self.pool.get('account.invoice')
     invoice_ids = invoice_obj.search(cr, uid, [('partner_id', '=', partner)])
     invoice_id = invoice_obj.browse(cr, uid, invoice_ids)[0]
 
     for invoice in invoice_id.invoice_line:
       product = invoice.product_id.id
-      
+
     product_exp = data['product']
 
     assert product == product_exp
-- | 
-  I creating a final invoice for "Sednacom" analytic account.
-- 
+-
+  I create final invoice for this analytic account.
+-
   !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
     balance_product: hr_timesheet.product_consultant
     date: 1
     name: 1
     price: 1
     time: 1
-- |
-  I click on "Create Invoice" button to create Invoice. 
-- 
+-
+  I click on "Create Invoice" button to create Invoice.
+-
   !python {model: hr.timesheet.invoice.create.final}: |
     self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_sednacom")]})
-    
-        
-- |
-  I can also make some theoretical revenue reports.    
-- |
-  I can also see timesheet profit using Timesheet profit report.  
\ No newline at end of file
+
+-
+  I can also make some theoretical revenue reports.
+-
+  I can also see timesheet profit using Timesheet profit report.
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_cost_ledger_report.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_cost_ledger_report.py
index 418aac5edd3..892c93252ee 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_cost_ledger_report.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_cost_ledger_report.py
@@ -39,7 +39,7 @@ class hr_timesheet_analytic_cost_ledger(osv.osv_memory):
         datas = {
              'ids': 'active_ids' in context and context['active_ids'] or [],
              'model': 'account.analytic.account',
-             'form': self.read(cr, uid, ids)[0]
+             'form': self.read(cr, uid, ids, context=context)[0]
                  }
         return {
             'type': 'ir.actions.report.xml',
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 b83b84746d2..4630ea1e833 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
@@ -46,18 +46,16 @@ class account_analytic_profit(osv.osv_memory):
 
     def print_report(self, cr, uid, ids, context=None):
         line_obj = self.pool.get('account.analytic.line')
-        product_obj = self.pool.get('product.product')
-        price_obj = self.pool.get('product.pricelist')
-        data = {}
-        data['form'] = self.read(cr, uid , ids, [], context=context)[0]
         if context is None:
             context = {}
+        data = {}
+        data['form'] = self.read(cr, uid , ids, [], context=context)[0]
         ids_chk = line_obj.search(cr, uid, [
                 ('date', '>=', data['form']['date_from']),
                 ('date', '<=', data['form']['date_to']),
                 ('journal_id', 'in', data['form']['journal_ids']),
                 ('user_id', 'in', data['form']['employee_ids']),
-                ])
+                ], context=context)
         if not ids_chk:
             raise osv.except_osv(_('Data Insufficient!'), _('No Records Found for Report!'))
 
@@ -67,14 +65,12 @@ class account_analytic_profit(osv.osv_memory):
              'ids': [],
              'model': 'account.analytic.line',
              'form': data['form']
-                 }
+             }
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.analytic.profit',
             'datas': datas,
-            'nodestroy': True
-
-            }
+             }
 
 account_analytic_profit()
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index e8309d84921..4878a6634b2 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -46,17 +46,21 @@ class final_invoice_create(osv.osv_memory):
         analytic_account_obj = self.pool.get('account.analytic.account')
         res_partner_obj = self.pool.get('res.partner')
         account_payment_term_obj = self.pool.get('account.payment.term')
+        invoice_obj = self.pool.get('account.invoice')
+        product_obj = self.pool.get('product.product')
+        fiscal_pos_obj = self.pool.get('account.fiscal.position')
+        invoice_line_obj = self.pool.get('account.invoice.line')
         invoices = []
 
         if context is None:
             context = {}
         result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
+        res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
 
-        data = self.read(cr, uid, ids, [], context)[0]
+        data = self.read(cr, uid, ids, [], context=context)[0]
         account_ids = 'active_ids' in context and context['active_ids'] or []
 
-        for account in analytic_account_obj.browse(cr, uid, account_ids, context):
+        for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
             partner = account.partner_id
             amount_total=0.0
             if (not partner) or not (account.pricelist_id):
@@ -77,15 +81,15 @@ class final_invoice_create(osv.osv_memory):
             curr_invoice = {
                 'name': time.strftime('%D')+' - '+account.name,
                 'partner_id': account.partner_id.id,
-                'address_contact_id': self.pool.get('res.partner').address_get(cr, uid, [account.partner_id.id], adr_pref=['contact'])['contact'],
-                'address_invoice_id': self.pool.get('res.partner').address_get(cr, uid, [account.partner_id.id], adr_pref=['invoice'])['invoice'],
+                'address_contact_id': res_partner_obj.address_get(cr, uid, [account.partner_id.id], adr_pref=['contact'])['contact'],
+                'address_invoice_id': res_partner_obj.address_get(cr, uid, [account.partner_id.id], adr_pref=['invoice'])['invoice'],
                 'payment_term': partner.property_payment_term.id or False,
                 'account_id': partner.property_account_receivable.id,
                 'currency_id': account.pricelist_id.currency_id.id,
                 'date_due': date_due,
                 'fiscal_position': account.partner_id.property_account_position.id
             }
-            last_invoice = self.pool.get('account.invoice').create(cr, uid, curr_invoice)
+            last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context)
             invoices.append(last_invoice)
 
             context2=context.copy()
@@ -116,14 +120,14 @@ class final_invoice_create(osv.osv_memory):
                     line.product_uom_id,
                     move_line.ref""", (account.id,))
             for product_id, amount, account_id, product_uom_id, ref in cr.fetchall():
-                product = self.pool.get('product.product').browse(cr, uid, product_id, context2)
+                product = product_obj.browse(cr, uid, product_id, context2)
 
                 if product:
                     taxes = product.taxes_id
                 else:
                     taxes = []
 
-                tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+                tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
                 curr_line = {
                     'price_unit': -amount,
                     'quantity': 1.0,
@@ -136,14 +140,13 @@ class final_invoice_create(osv.osv_memory):
                     'account_id': account_id,
                     'account_analytic_id': account.id
                 }
-                self.pool.get('account.invoice.line').create(cr, uid, curr_line)
+                invoice_line_obj.create(cr, uid, curr_line, context=context)
 
             if not data['balance_product']:
                 raise osv.except_osv(_('Balance product needed'), _('Please fill a Balance product in the wizard'))
-            product = self.pool.get('product.product').browse(cr, uid, data['balance_product'], context2)
-
+            product = product_obj.browse(cr, uid, data['balance_product'], context2)
             taxes = product.taxes_id
-            tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+            tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
             account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
             curr_line = {
                 'price_unit': account.amount_max - amount_total,
@@ -157,9 +160,9 @@ class final_invoice_create(osv.osv_memory):
                 'account_id': account_id,
                 'account_analytic_id': account.id
             }
-            self.pool.get('account.invoice.line').create(cr, uid, curr_line)
+            invoice_line_obj.create(cr, uid, curr_line, context=context)
             if account.amount_max < amount_total:
-                self.pool.get('account.invoice').write(cr, uid, [last_invoice], {'type': 'out_refund',})
+                invoice_obj.write(cr, uid, [last_invoice], {'type': 'out_refund',}, context=context)
             cr.execute('update account_analytic_line set invoice_id=%s where invoice_id is null and account_id=%s', (last_invoice, account.id))
 
         return {
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index a5b2e35622c..57a1e4aaaa2 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -49,7 +49,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
         if not len(context['active_ids']):
             return {}
         #Checking whether the analytic line is invoiced or not
-        analytic_line_obj = self.pool.get('account.analytic.line').browse(cr, uid, context['active_ids'], context)
+        analytic_line_obj = self.pool.get('account.analytic.line').browse(cr, uid, context['active_ids'], context=context)
         for obj_acc in analytic_line_obj:
             if obj_acc.invoice_id and obj_acc.invoice_id.state !='cancel':
                 raise osv.except_osv(_('Warning'),_('The analytic entry "%s" is already invoiced!')%(obj_acc.name,))
@@ -67,13 +67,21 @@ class hr_timesheet_invoice_create(osv.osv_memory):
         analytic_account_obj = self.pool.get('account.analytic.account')
         res_partner_obj = self.pool.get('res.partner')
         account_payment_term_obj = self.pool.get('account.payment.term')
+        invoice_obj = self.pool.get('account.invoice')
+        product_obj = self.pool.get('product.product')
+        invoice_factor_obj = self.pool.get('hr_timesheet_invoice.factor')
+        pro_price_obj = self.pool.get('product.pricelist')
+        fiscal_pos_obj = self.pool.get('account.fiscal.position')
+        product_uom_obj = self.pool.get('product.uom')
+        invoice_line_obj = self.pool.get('account.invoice.line')
         invoices = []
-
+        if context is None:
+            context = {}
         result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        data = self.read(cr, uid, ids, [], context)[0]
+        res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
+        data = self.read(cr, uid, ids, [], context=context)[0]
         account_ids = data['accounts']
-        for account in analytic_account_obj.browse(cr, uid, account_ids, context):
+        for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
             partner = account.partner_id
             if (not partner) or not (account.pricelist_id):
                 raise osv.except_osv(_('Analytic Account incomplete'),
@@ -106,7 +114,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                 'date_due': date_due,
                 'fiscal_position': account.partner_id.property_account_position.id
             }
-            last_invoice = self.pool.get('account.invoice').create(cr, uid, curr_invoice)
+            last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context)
             invoices.append(last_invoice)
 
             context2 = context.copy()
@@ -115,14 +123,14 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                     "FROM account_analytic_line as line " \
                     "WHERE account_id = %s " \
                         "AND id IN %s AND to_invoice IS NOT NULL " \
-                    "GROUP BY product_id,to_invoice", (account.id,tuple(context['active_ids']),))
+                    "GROUP BY product_id,to_invoice", (account.id, tuple(context['active_ids']),))
 
-            for product_id,factor_id,qty in cr.fetchall():
-                product = self.pool.get('product.product').browse(cr, uid, product_id, context2)
+            for product_id, factor_id, qty in cr.fetchall():
+                product = product_obj.browse(cr, uid, product_id, context2)
                 if not product:
                     raise osv.except_osv(_('Error'), _('At least one line has no product !'))
                 factor_name = ''
-                factor = self.pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context2)
+                factor = invoice_factor_obj.browse(cr, uid, factor_id, context2)
 
                 if not data['product']:
                     if factor.customer_name:
@@ -130,16 +138,16 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                     else:
                         factor_name = product.name
                 else:
-                    factor_name = self.pool.get('product.product').name_get(cr, uid, [data['product']], context=context)[0][1]
+                    factor_name = product_obj.name_get(cr, uid, [data['product']], context=context)[0][1]
 
                 if account.pricelist_id:
                     pl = account.pricelist_id.id
-                    price = self.pool.get('product.pricelist').price_get(cr,uid,[pl], data['product'] or product_id, qty or 1.0, account.partner_id.id)[pl]
+                    price = pro_price_obj.price_get(cr,uid,[pl], data['product'] or product_id, qty or 1.0, account.partner_id.id)[pl]
                 else:
                     price = 0.0
 
                 taxes = product.taxes_id
-                tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+                tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
                 account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
                 curr_line = {
                     'price_unit': price,
@@ -158,7 +166,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                 #
                 # Compute for lines
                 #
-                cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(data['ids']), product_id, factor_id))
+                cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(context['active_ids']), product_id, factor_id))
 
                 line_ids = cr.dictfetchall()
                 note = []
@@ -169,7 +177,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                         details.append(line['date'])
                     if data['time']:
                         if line['product_uom_id']:
-                            details.append("%s %s" % (line['unit_amount'], self.pool.get('product.uom').browse(cr, uid, [line['product_uom_id']],context2)[0].name))
+                            details.append("%s %s" % (line['unit_amount'], product_uom_obj.browse(cr, uid, [line['product_uom_id']],context2)[0].name))
                         else:
                             details.append("%s" % (line['unit_amount'], ))
                     if data['name']:
@@ -179,17 +187,17 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                     note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
 
                 curr_line['note'] = "\n".join(map(lambda x: unicode(x) or '',note))
-                self.pool.get('account.invoice.line').create(cr, uid, curr_line)
-                cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s" ,(last_invoice, account.id,tuple(data['ids'])))
+                invoice_line_obj.create(cr, uid, curr_line, context=context)
+                cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s" ,(last_invoice, account.id, tuple(context['active_ids'])))
 
-        self.pool.get('account.invoice').button_reset_taxes(cr, uid, [last_invoice], context)
+        invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
 
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
 
-        mod_id = mod_obj.search(cr, uid, [('name', '=', 'action_invoice_tree1')])[0]
-        res_id = mod_obj.read(cr, uid, mod_id, ['res_id'])['res_id']
-        act_win = act_obj.read(cr, uid, res_id, [])
+        mod_ids = mod_obj.search(cr, uid, [('name', '=', 'action_invoice_tree1')], context=context)[0]
+        res_id = mod_obj.read(cr, uid, mod_ids, ['res_id'], context=context)['res_id']
+        act_win = act_obj.read(cr, uid, res_id, [], context=context)
         act_win['domain'] = [('id','in',invoices),('type','=','out_invoice')]
         act_win['name'] = _('Invoices')
         return act_win
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 7930df1f243..73bb496967f 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -43,7 +43,7 @@ The validation can be configured in the company:
 * Period size (day, week, month, year)
 * Maximal difference between timesheet and attendances
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process'],
     'init_xml': [],
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index 16cb267c041..80d85246631 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -36,7 +36,7 @@
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Timesheets">
+                <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('done')" string="Timesheets">
                     <field name="date_from"/>
                     <field name="user_id"/>
                     <field name="name"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 2eb352974d7..8b9744877b9 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -20,10 +20,9 @@
 ##############################################################################
 
 import time
-from osv import fields
-from osv import osv
 import netsvc
 
+from osv import fields, osv
 from mx import DateTime
 from tools.translate import _
 
@@ -95,8 +94,10 @@ class hr_timesheet_sheet(osv.osv):
     _table = 'hr_timesheet_sheet_sheet'
     _order = "id desc"
 
-    def _total_day(self, cr, uid, ids, name, args, context):
+    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 \
@@ -137,7 +138,7 @@ class hr_timesheet_sheet(osv.osv):
         for sheet in self.browse(cr, uid, ids, context=context):
             result[sheet.id] = 'none'
             emp_ids2 = emp_obj.search(cr, uid,
-                    [('user_id', '=', sheet.user_id.id)])
+                    [('user_id', '=', sheet.user_id.id)], context=context)
             if emp_ids2:
                 link_emp[emp_ids2[0]] = sheet.id
                 emp_ids.append(emp_ids2[0])
@@ -167,11 +168,11 @@ class hr_timesheet_sheet(osv.osv):
             context = {}
         for sheet in self.browse(cr, uid, ids, context=context):
             if DateTime.now() <= DateTime.strptime(sheet.date_from, '%Y-%m-%d'):
-                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,})
+                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
             elif DateTime.now() >= DateTime.strptime(sheet.date_to, '%Y-%m-%d'):
-                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,})
+                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
             else:
-                self.write(cr, uid, [sheet.id], {'date_current': time.strftime('%Y-%m-%d')})
+                self.write(cr, uid, [sheet.id], {'date_current': time.strftime('%Y-%m-%d')}, context=context)
         return True
 
     def date_previous(self, cr, uid, ids, context=None):
@@ -179,11 +180,11 @@ class hr_timesheet_sheet(osv.osv):
             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,})
+                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
             else:
                 self.write(cr, uid, [sheet.id], {
                     'date_current': (DateTime.strptime(sheet.date_current, '%Y-%m-%d') + DateTime.RelativeDateTime(days=-1)).strftime('%Y-%m-%d'),
-                })
+                }, context=context)
         return True
 
     def date_next(self, cr, uid, ids, context=None):
@@ -191,11 +192,11 @@ class hr_timesheet_sheet(osv.osv):
             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,})
+                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
             else:
                 self.write(cr, uid, [sheet.id], {
                     'date_current': (DateTime.strptime(sheet.date_current, '%Y-%m-%d') + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d'),
-                })
+                }, context=context)
         return True
 
     def button_dummy(self, cr, uid, ids, context=None):
@@ -203,31 +204,31 @@ class hr_timesheet_sheet(osv.osv):
             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,})
+                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
             elif 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,})
+                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
         return True
 
     def sign_in(self, cr, uid, ids, context=None):
         emp_obj = self.pool.get('hr.employee')
         if context is None:
             context = {}
-        if not self.browse(cr, uid, ids, context)[0].date_current == time.strftime('%Y-%m-%d'):
+        if not self.browse(cr, uid, ids, context=context)[0].date_current == time.strftime('%Y-%m-%d'):
             raise osv.except_osv(_('Error !'), _('You can not sign in from an other date than today'))
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
+        emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
         context['sheet_id']=ids[0]
-        success = emp_obj.attendance_action_change(cr, uid, emp_id, type='sign_in', context=context,)
+        success = emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_in', context=context,)
         return True
 
     def sign_out(self, cr, uid, ids, context=None):
         emp_obj = self.pool.get('hr.employee')
         if context is None:
             context = {}
-        if not self.browse(cr, uid, ids, context)[0].date_current == time.strftime('%Y-%m-%d'):
+        if not self.browse(cr, uid, ids, context=context)[0].date_current == time.strftime('%Y-%m-%d'):
             raise osv.except_osv(_('Error !'), _('You can not sign out from an other date than today'))
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
+        emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)])
         context['sheet_id']=ids[0]
-        success = emp_obj.attendance_action_change(cr, uid, emp_id, type='sign_out', context=context,)
+        success = emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_out', context=context,)
         return True
 
     _columns = {
@@ -266,7 +267,9 @@ class hr_timesheet_sheet(osv.osv):
         'department_id':fields.many2one('hr.department','Department'),
     }
 
-    def _default_date_from(self,cr, uid, context={}):
+    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':
@@ -277,7 +280,7 @@ class hr_timesheet_sheet(osv.osv):
             return time.strftime('%Y-01-01')
         return time.strftime('%Y-%m-%d')
 
-    def _default_date_to(self,cr, uid, context={}):
+    def _default_date_to(self,cr, uid, context=None):
         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':
@@ -328,17 +331,19 @@ class hr_timesheet_sheet(osv.osv):
             wf_service.trg_create(uid, self._name, id, cr)
         return True
 
-    def name_get(self, cr, uid, ids, context={}):
+    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']) \
                 for r in self.read(cr, uid, ids, ['date_from', 'date_to'],
-                    context, load='_classic_write')]
+                    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'])
+        sheets = self.read(cr, uid, ids, ['state','total_attendance'], context=context)
         for sheet in sheets:
             if sheet['state'] in ('confirm', 'done'):
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sheet(s) which are already confirmed !'))
@@ -352,14 +357,17 @@ hr_timesheet_sheet()
 class hr_timesheet_line(osv.osv):
     _inherit = "hr.analytic.timesheet"
 
-    def _get_default_date(self, cr, uid, context={}):
+    def _get_default_date(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if 'date' in context:
             return context['date']
         return time.strftime('%Y-%m-%d')
 
-    def _sheet(self, cursor, user, ids, name, args, context):
+    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 \
@@ -384,6 +392,8 @@ 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')
@@ -393,7 +403,7 @@ class hr_timesheet_line(osv.osv):
             fargs = args[i][0].split('.', 1)
             if len(fargs) > 1:
                 args[i] = (fargs[0], 'in', sheet_obj.search(cursor, user,
-                    [(fargs[1], args[i][1], args[i][2])]))
+                    [(fargs[1], args[i][1], args[i][2])], context=context))
                 i += 1
                 continue
             if isinstance(args[i][2], basestring):
@@ -470,12 +480,16 @@ hr_timesheet_line()
 class hr_attendance(osv.osv):
     _inherit = "hr.attendance"
 
-    def _get_default_date(self, cr, uid, context={}):
+    def _get_default_date(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if 'name' in context:
             return context['name'] + time.strftime(' %H:%M:%S')
         return time.strftime('%Y-%m-%d %H:%M:%S')
 
-    def _sheet(self, cursor, user, ids, name, args, context):
+    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 \
@@ -504,14 +518,16 @@ class hr_attendance(osv.osv):
     def _sheet_search(self, cursor, user, obj, name, args, context=None):
         if not len(args):
             return []
-        sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
 
+        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)
             if len(fargs) > 1:
                 args[i] = (fargs[0], 'in', sheet_obj.search(cursor, user,
-                    [(fargs[1], args[i][1], args[i][2])]))
+                    [(fargs[1], args[i][1], args[i][2])], context=context))
                 i += 1
                 continue
             if isinstance(args[i][2], basestring):
@@ -564,9 +580,11 @@ class hr_attendance(osv.osv):
         'name': _get_default_date,
     }
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
         if 'sheet_id' in context:
-            ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, context['sheet_id'])
+            ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, context['sheet_id'], context=context)
             if ts.state not in ('draft', 'new'):
                 raise osv.except_osv(_('Error !'), _('You cannot modify an entry in a confirmed timesheet !'))
         res = super(hr_attendance,self).create(cr, uid, vals, context=context)
@@ -580,7 +598,9 @@ class hr_attendance(osv.osv):
         self._check(cr, uid, ids)
         return super(hr_attendance,self).unlink(cr, uid, ids,*args, **kwargs)
 
-    def write(self, cr, uid, ids, vals, context={}):
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
         self._check(cr, uid, ids)
         res = super(hr_attendance,self).write(cr, uid, ids, vals, context=context)
         if 'sheet_id' in context:
@@ -718,9 +738,9 @@ class res_company(osv.osv):
     _inherit = 'res.company'
     _columns = {
         'timesheet_range': fields.selection(
-            [('day','Day'),('week','Week'),('month','Month'),('year','Year')], 'Timeshet range'),
-        'timesheet_max_difference': fields.float('Timesheet allowed difference',
-            help="Allowed difference between the sign in/out and the timesheet " \
+            [('day','Day'),('week','Week'),('month','Month'),('year','Year')], 'Timesheet range'),
+        'timesheet_max_difference': fields.float('Timesheet allowed difference(Hours)',
+            help="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."),
     }
     _defaults = {
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 050b798f16d..be04a9d5186 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -7,7 +7,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Timesheets"
-                    colors="blue:state == 'draft';grey:state == 'done'">
+                    colors="blue:state == 'draft';gray:state == 'done'">
                     <field name="user_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
@@ -180,7 +180,7 @@
                     <group col="4" colspan="2">
                         <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-gtk-jump-to-rtl"/>
                         <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="terp-gtk-stop"/>
+                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel"/>
                         <button name="done" states="confirm" string="Accept" type="workflow" icon="terp-camera_test"/>
                     </group>
                 </form>
@@ -195,7 +195,7 @@
                 <search string="Search Timesheet">
                     <group col="10" colspan="4">
                         <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
-                        <filter icon="terp-gtk-go-back-rtl" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
+                        <filter icon="terp-gtk-go-back-rtl" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
                         <field name="user_id" select="1"/>
                         <field name="date_from"/>
@@ -222,6 +222,7 @@
             <field name="view_id" eval="False"/>
             <field name="context">{'search_default_my_timesheet':1, 'search_default_user_id':uid }</field>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
+            <field name="help">Employees can encode their time spent on the different projects. A project is an analytic account and the time spent on a project generate costs on the analytic account.</field>
         </record>
 
         <!--Time Tracking menu in project Management-->
@@ -334,7 +335,7 @@
             <field name="type">tree</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Timesheets">
+                <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('done')" string="Timesheets">
                     <field name="date_from"/>
                     <field name="user_id"/>
                     <field name="name"/>
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index 4a878e475db..efb48893eba 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -7,26 +7,26 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:29+0000\n"
+"PO-Revision-Date: 2010-07-21 08: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-06-22 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+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 "审查结束每天检查完成"
+msgstr "完成每天检查审查结束"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
-msgstr "你不能有两个重叠的时间表请使用菜单\"我的当前时间表\"来避免这问题"
+msgstr "你不能有两个重叠的时间表! 请使用菜单\"我的当前时间表\"来避免这问题"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -39,7 +39,7 @@ msgstr "表"
 #. module: hr_timesheet_sheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
@@ -106,7 +106,7 @@ msgstr "确认"
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Day"
-msgstr "日"
+msgstr "天"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -132,7 +132,7 @@ msgstr "你必须选择一个当前日期是在时间表的日期中"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Difference"
-msgstr "差合计"
+msgstr "差异合计"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
@@ -159,7 +159,7 @@ msgstr "允许在签出签入的差和计算时间表.如果你不想控制设
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Timesheet by Days"
-msgstr "时间表按天"
+msgstr "时间表按的多天"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
@@ -169,7 +169,7 @@ msgstr "时间表确认结束在这周/月"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
@@ -184,7 +184,7 @@ msgstr "日期从"
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet Process"
-msgstr "人力资源时间表处理"
+msgstr "人力资源时间表进程"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
@@ -194,7 +194,7 @@ msgstr "辅助核算成本"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Confirmed"
-msgstr "确认"
+msgstr "已确认"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
@@ -217,7 +217,7 @@ msgstr "时间表明细"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
 msgid "Encode your timesheet line"
-msgstr "编码你的时间表明细"
+msgstr "你的时间表明细编码"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
@@ -237,7 +237,7 @@ 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 "时间表表确认的结束周期"
+msgstr "时间表表确认的结束期间"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -252,7 +252,7 @@ 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 "确认时间表周期的结束"
+msgstr "确认时间表的结束期间"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -277,7 +277,7 @@ msgstr "周"
 #. module: hr_timesheet_sheet
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -288,7 +288,7 @@ 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 "时间表周期"
+msgstr "时间表期间"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -331,7 +331,7 @@ msgstr "在这周的发票"
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
@@ -383,7 +383,7 @@ msgstr "当前状态"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Invoice on timesheet"
-msgstr "这时间表的发票"
+msgstr "时间表的发票"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -393,7 +393,7 @@ 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 "科目时间表"
+msgstr "科目(项)时间表"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,name:0
@@ -419,13 +419,13 @@ msgstr "时间表批准"
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference"
-msgstr "时间表允许差"
+msgstr "时间表允许差异"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: field:hr_timesheet_sheet.sheet,period_ids:0
 msgid "Period"
-msgstr "周期"
+msgstr "期间"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -450,7 +450,7 @@ msgstr "时间表明细"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr "时间表科目"
+msgstr "时间表项"
 
 #. module: hr_timesheet_sheet
 #: constraint:ir.model:0
@@ -466,7 +466,7 @@ msgstr "项目管理批准的时间表"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
 msgid "Whatever time u spent for phone call"
-msgstr "无论什么时间你花费的电话呼叫"
+msgstr "你花费的电话呼叫时间"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -504,14 +504,14 @@ msgstr "签出"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
-msgstr "日间"
+msgstr "按天"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
 #: field:hr_timesheet_sheet.sheet.day,total_difference:0
 msgid "Difference"
-msgstr "差别"
+msgstr "差异"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
@@ -526,7 +526,7 @@ 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 "在此周期结束:周/月"
+msgstr "在此期间结束周/月"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
@@ -541,7 +541,7 @@ msgstr "已创建的辅助核算成本"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
 msgid "Invoice rate"
-msgstr "发票率"
+msgstr "发票税率"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
@@ -556,7 +556,7 @@ msgstr "你工作审查结束日期"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
 msgid "Analytic accounts"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
@@ -578,7 +578,7 @@ msgstr "当前日期"
 #: 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 "不可用的时间表"
+msgstr "不确认的时间表"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -594,7 +594,7 @@ msgstr "合计"
 #: 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 "批准我部门的时间表"
+msgstr "确认我部门的时间表"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 9dadb599ba7..8ab227a1870 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -72,7 +72,7 @@
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended options..." groups="base.group_extended">
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
                         <field name="general_account_id"/>
                         <field name="product_id"/>
                         <field name="journal_id"/>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 0bc2b70d341..0a4aaf1dbf3 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -18,7 +18,7 @@
             <field name="model">timesheet.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Timesheet">
+                <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('cancel')" string="Timesheet">
                     <field name="date_current" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="user_id" invisible="1"/>
@@ -96,7 +96,7 @@
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended options..." groups="base.group_extended">
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
                         <field name="general_account_id"/>
                         <field name="to_invoice" widget="selection"/>
                         <separator orientation="vertical"/>
@@ -121,7 +121,7 @@
             <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
-        <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all" 
+        <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
                 parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index 38186031028..1486d7f9bb4 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -1,55 +1,36 @@
-- |
-  In order, to test hr_timesheet_sheet module in OpenERP, I create  timesheet and check validation process done by 
-  manager.
-  
-- |
-  Now, I  create a new employee “Mark Johnson” to test Timesheet.
+-
+  In order to test hr_timesheet_sheet module in OpenERP, I create timesheet and check validation process done by manager.
+-
+  I will create a company and set maximum allowed difference between timesheet and attendance to 1 hour
+-
+  !record {model: res.company, id: res_company_openERP}:
+    currency_id: base.ARS
+    name: OpenERP SA
+    partner_id: base.res_partner_desertic_hispafuentes
+    timesheet_max_difference: 1.0
+
+-
+  I  create a new employee “Mark Johnson”.
 -
   !record {model: hr.employee, id: hr_employee_employee0}:
     address_home_id: base.res_partner_address_1
-    company_id: base.main_company
+    company_id: res_company_openERP
     gender: male
     marital: hr.hr_employee_marital_status_single
     name: Mark Johnson
     user_id: base.user_root
-    
-- |
-  I create new user "user1".
-- 
-  !record {model: res.users, id: res_users_user0}:
-    company_id: base.main_company
-    context_lang: en_US
-    groups_id:
-      - hr.group_hr_user
-      - hr_attendance.group_hr_attendance
-      - base.group_user
-      - base.group_extended
-      - hr.group_hr_manager 
-    login: user1
-    name: user1
-    password: user1   
 
-- |
-  create another employee "Francline" as "user1".
-- 
-  !record {model: hr.employee, id: hr_employee_fracline0}:
-    address_home_id: base.res_partner_address_8
-    name: Francline
-    parent_id: 'hr_employee_employee0'
-    user_id: 'res_users_user0'
- 
-- |
-  Given that I have Timesheet journal for employee. 
-  
-- 
+-
+  I create new Timesheet journal for employee.
+-
   !record {model: account.analytic.journal, id: analytic_journal}:
     code: TS
     name: Timesheet Journal
     type: general
-    
-- |
-  Given that I have product for "Consultancy - Senior Developer".
-- 
+
+-
+  I create a new product "Consultancy - Senior Developer".
+-
   !record {model: product.product, id: product_consultant}:
     categ_id: product.product_category_10
     default_code: DEV
@@ -63,77 +44,111 @@
     uom_id: product.uom_hour
     uom_po_id: product.uom_hour
 
-- |
-  I assing product and journal to  "Mark Johnson" 
-- 
+-
+  I assign this product and journal to  "Mark Johnson"
+-
   !record {model: hr.employee, id: hr_employee_employee0}:
-    product_id: product_consultant       
+    product_id: product_consultant
     journal_id: analytic_journal
-- |
-  And also assing product and journal to "francline" employee.
-- 
-  !record {model: hr.employee, id: hr_employee_fracline0}:
-    product_id: product_consultant       
-    journal_id: analytic_journal
-      
-- |
-  I connect as "francline" and create my current timesheet. 
-- 
+
+-
+  I create my current timesheet for "Mark Johnson".
+-
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
     date_current: '2010-05-26'
     date_from: '2010-05-01'
     date_to: '2010-05-31'
     name: Week-22(2010)
     state: new
-    user_id: 'res_users_user0'
-- |
-  Now , When I  came in office , I create Attendances and perform "Sign In" action with proper reason.
-- 
+    user_id: base.user_root
+-
+  Now , at the time of login, I create Attendances and perform "Sign In" action.
+-
   !record {model: hr.attendance, id: hr_attendance_0}:
     action: sign_in
-    employee_id: 'hr_employee_fracline0'
+    employee_id: 'hr_employee_employee0'
     name: '2010-05-26 10:08:08'
-    
-- |
-  When I left office , I create attendance and perform "Sign Out".      	
-- 
+
+-
+  At the time of logout, I create attendance and perform "Sign Out".
+-
   !record {model: hr.attendance, id: hr_attendance_1}:
     action: sign_out
-    employee_id: 'hr_employee_fracline0'
+    employee_id: 'hr_employee_employee0'
     name: '2010-05-26 15:10:55'
 
-- 
-  I create Timesheet Entry for time spend on today work.
 -
-    
+  I create Timesheet Entry for time spend on today work.
+
+-
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet.sheet1}:
     timesheet_ids:
       - account_id: account.analytic_sednacom
         date: '05/26/2010'
         name: 'Develop yaml for hr module'
-        unit_amount: 5.00
+        unit_amount: 3.00
         amount: -90.00
         product_id: hr_timesheet.product_consultant
         general_account_id: account.a_expense
-        user_id: res_users_user0
-        journal_id: hr_timesheet.analytic_journal  
-
-- |
-  I confirm my timesheet at end of period by click on "Confirm" button which is signal of workflow.
-- 
-  !python {model: hr_timesheet_sheet.sheet}: |
-      uid = ref('res_users_user0')
-      self.button_confirm(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')])
-- |
-  I check that state is "Confirmed".
-- 
-  !assert {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}: 
-      - state == 'confirm'
-- |
-  "Mark Johnson" check  timesheet and time spend on project by "francline" employee.
-   And then accept it request by click on "Accept" button.If "Maximal difference between timesheet and attendances" is  more than 1 then manage can "Refuse" his request.
-
+        user_id: base.user_root
+        journal_id: hr_timesheet.analytic_journal
 
 -
-   !python {model: hr_timesheet_sheet.sheet}: |
-      self.write(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {'state': 'done'})              
\ No newline at end of file
+  I confirm my timesheet at end of period by click on "Confirm" button,
+   if the difference between timesheet hour and attendance hour is more than 1 hour it will give message.
+-
+  !python {model: hr_timesheet_sheet.sheet}: |
+    uid = ref('base.user_root')
+    import netsvc
+    for sheet in self.browse(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')]):
+        di = sheet.user_id.company_id.timesheet_max_difference
+        if (abs(sheet.total_difference) < di) or not di:
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'hr_timesheet_sheet.sheet', sheet.id, 'confirm', cr)
+        else:
+            print "Please verify that the total difference of the sheet is lower than %.2f"   %di
+
+-
+  I Modified the timesheet record.
+-
+  !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet.sheet1}:
+    timesheet_ids:
+      - account_id: account.analytic_sednacom
+        date: '05/26/2010'
+        name: 'Develop yaml for hr module'
+        unit_amount: 2.0
+        amount: -90.00
+        product_id: hr_timesheet.product_consultant
+        general_account_id: account.a_expense
+        user_id: base.user_root
+        journal_id: hr_timesheet.analytic_journal
+
+-
+  I tried again to confirm the timesheet after modification.
+-
+  !python {model: hr_timesheet_sheet.sheet}: |
+        uid = ref('base.user_root')
+        self.button_confirm(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {"lang": 'en_US', "active_ids":
+          [ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form")], "tz": False, "active_model":
+          "ir.ui.menu", "department_id": False, "section_id": False, "search_default_my_timesheet":
+          1, "search_default_user_id": 1, "project_id": False, "active_id": ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"),
+          })
+
+-
+  This time timesheet confirmed successfully.
+   I check that state is "Confirmed".
+-
+  !assert {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
+      - state == 'confirm'
+-
+  The manager will accept This request by click on "Accept" button.
+
+-
+  !python {model: hr_timesheet_sheet.sheet}: |
+    self.write(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {'state': 'done'})
+-
+  I check that state is "Done".
+-
+  !assert {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
+      - state == 'done'
+
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
index 4d9998014c8..6ec2dd5b1e8 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
@@ -29,18 +29,20 @@ class hr_timesheet_current_open(osv.osv_memory):
 
     def open_timesheet(self, cr, uid, ids, context=None):
         ts = self.pool.get('hr_timesheet_sheet.sheet')
+        if context is None:
+            context = {}
         view_type = 'form,tree'
 
-        user_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)])
+        user_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
         if not len(user_ids):
             raise osv.except_osv(_('Error !'), _('No employee defined for your user !'))
-        ids = ts.search(cr, uid, [('user_id','=',uid),('state','=','draft'),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))])
+        ids = ts.search(cr, uid, [('user_id','=',uid),('state','=','draft'),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))], context=context)
 
         if len(ids) > 1:
             view_type = 'tree,form'
             domain = "[('id','in',["+','.join(map(str, ids))+"]),('user_id', '=', uid)]"
         elif len(ids)==1:
-            ts.write(cr, uid, ids, {'date_current': time.strftime('%Y-%m-%d')})
+            ts.write(cr, uid, ids, {'date_current': time.strftime('%Y-%m-%d')}, context=context)
             domain = "[('user_id', '=', uid)]"
         else:
             domain = "[('user_id', '=', uid)]"
diff --git a/addons/html_view/__openerp__.py b/addons/html_view/__openerp__.py
index 8f32ef9eaaf..8ffd2f6abd4 100644
--- a/addons/html_view/__openerp__.py
+++ b/addons/html_view/__openerp__.py
@@ -1,7 +1,7 @@
 {
     "name" : "Html View",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Generic Modules/Inventory Control",
     "depends" : ['base'],
     "init_xml" : ['html_view.xml'],
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index d2b854ba0b5..28ab76e8d5e 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -31,7 +31,7 @@
     Each idea has a score based on the different votes.
     The managers can obtain an easy view on best ideas from all the users.
     Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/idea/i18n/zh_CN.po b/addons/idea/i18n/zh_CN.po
index 726d4a46f34..94aa3d1b3da 100644
--- a/addons/idea/i18n/zh_CN.po
+++ b/addons/idea/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:31+0000\n"
+"PO-Revision-Date: 2010-07-21 08:35+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-06-22 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -39,12 +39,12 @@ msgstr "统计"
 #: model:ir.actions.act_window,name:idea.action_idea_idea_my_idea
 #: model:ir.ui.menu,name:idea.menu_idea_idea_my_idea
 msgid "My Ideas"
-msgstr "我的创意"
+msgstr "我的构想"
 
 #. module: idea
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -57,14 +57,14 @@ msgstr "没投票"
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open_my
 msgid "My Open Ideas"
-msgstr "我待处理的创意"
+msgstr "我的待处理构想"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea
 #: model:ir.ui.menu,name:idea.menu_ideas
 #: model:ir.ui.menu,name:idea.menu_ideas1
 msgid "Ideas"
-msgstr "创意"
+msgstr "构想"
 
 #. module: idea
 #: field:idea.category,child_ids:0
@@ -74,19 +74,19 @@ msgstr "子分类"
 #. module: idea
 #: view:idea.idea:0
 msgid "New Idea"
-msgstr "新的创意"
+msgstr "新的构想"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category_tree
 #: model:ir.ui.menu,name:idea.menu_idea_category_tree
 msgid "Ideas by Categories"
-msgstr "创意分类"
+msgstr "构想分类"
 
 #. module: idea
 #: field:idea.vote,score:0
 #: field:idea.vote.stat,score:0
 msgid "Score"
-msgstr "得分"
+msgstr "评分"
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -96,7 +96,7 @@ msgstr "草稿"
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's vote"
-msgstr "创意投票"
+msgstr "构想投票"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
@@ -107,17 +107,17 @@ msgstr "统计投票"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Category for an idea"
-msgstr "创意分类"
+msgstr "构想分类"
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr "创意管理"
+msgstr "构想管理"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote_stat
@@ -156,17 +156,17 @@ msgstr "一般"
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_reporting
 msgid "Reporting"
-msgstr "内部报表"
+msgstr "报表"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
 msgid "Idea Votes Statistics"
-msgstr "创意投票统计"
+msgstr "构想投票统计"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "idea.vote"
-msgstr "创意投票"
+msgstr "构想投票"
 
 #. module: idea
 #: field:idea.comment,user_id:0
@@ -203,7 +203,7 @@ msgstr "我的投票"
 #. module: idea
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: idea
 #: view:idea.vote:0
@@ -220,14 +220,15 @@ msgid ""
 "managers can obtain an easy view on best ideas from all the users. Once "
 "installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
-"这模块允许你在创新的企业里简单和有效地使用.它允许每个人去表达不同的主题,其他用户能评价这些创意和对特定的创意进行投票.每个创意所得投票决定得分.\n"
-"管理人员可以很容易得到所有用户创意.一旦安装,在工具主菜单查看创意菜单."
+"这模块允许你在企业创新里简单和有效地使用.\r\n"
+"它允许每个人对不同注意表达构想, 其它用户能评价这些构想和对具体的构想进行投票. 每个构想根据不同投票决定得分.\r\n"
+"管理人员可以很容易得到所有用户对构想的评价."
 
 #. module: idea
 #: field:idea.comment,create_date:0
 #: field:idea.idea,create_date:0
 msgid "Creation date"
-msgstr "建立日期"
+msgstr "创建日期"
 
 #. module: idea
 #: field:idea.idea,count_votes:0
@@ -242,13 +243,13 @@ msgstr "投票数"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr "创意"
+msgstr ""
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_draft_my
 msgid "My Draft Ideas"
-msgstr "我的创意草稿"
+msgstr "我的构想草稿"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
@@ -266,7 +267,7 @@ msgstr "坏"
 #: view:idea.idea:0
 #: model:ir.ui.menu,name:idea.menu_idea_idea
 msgid "All Ideas"
-msgstr "所有创意"
+msgstr "所有构想"
 
 #. module: idea
 #: view:idea.comment:0
@@ -284,12 +285,12 @@ msgstr "评论数"
 #. module: idea
 #: field:idea.idea,title:0
 msgid "Idea Summary"
-msgstr "创意摘要"
+msgstr "构想摘要"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Category of ideas"
-msgstr "创意分类"
+msgstr "构想分类"
 
 #. module: idea
 #: field:idea.category,summary:0
@@ -301,13 +302,13 @@ msgstr "摘要"
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open
 msgid "Open Ideas"
-msgstr "待处理的创意"
+msgstr "待处理的构想"
 
 #. module: idea
 #: view:idea.idea:0
 #: view:idea.vote.stat:0
 msgid "vote_stat of ideas"
-msgstr "开始对创意投票"
+msgstr "开始对构想投票"
 
 #. module: idea
 #: view:idea.comment:0
@@ -337,7 +338,7 @@ msgstr "工具"
 #: field:idea.vote,idea_id:0
 #: field:idea.vote.stat,idea_id:0
 msgid "Idea"
-msgstr "创意"
+msgstr "构想"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -364,7 +365,7 @@ msgstr "取消"
 #. module: idea
 #: view:idea.idea:0
 msgid "Close"
-msgstr "结束"
+msgstr "关闭"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
@@ -379,7 +380,7 @@ msgstr "待处理"
 #. module: idea
 #: help:idea.idea,description:0
 msgid "Content of the idea"
-msgstr "这创意的内容"
+msgstr "构想的内容"
 
 #~ msgid "Accepted"
 #~ msgstr "已同意"
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index b5016d5679c..309cc824cb7 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -260,7 +260,7 @@
         <field name="model">idea.idea</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-        <tree string="Ideas">
+        <tree colors="blue:state in ('draft');black:state in ('open','close');gray:state in('cancel')" string="Ideas">
             <field name="title"/>
             <field name="category_id" />
             <field name="created_date"/>
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index 05b1119c4a4..a20d0378f82 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Knowledge Management System",
     "version" : "1.0",
     "depends" : ["base"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "description": """Installer for knowledge-based tools
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index e1da251fb9a..081d0734005 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Knowledge Modules Installation</attribute>
+            <attribute name="string">Knowledge Modules Configuration</attribute>
           </form>
 
           <separator string="title" position="attributes">
@@ -20,7 +20,7 @@
 	      		</xpath>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">From this screen, you can select various OpenERP applications which will help employees store information, distribute it and share it with one another.</attribute>
+            <attribute name="string">You can select various OpenERP applications which will help you and your employees to store and share information.</attribute>
           </xpath>
           <group colspan="8" position="replace">
           <group colspan="4">
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index e5d8e1255a6..354ae84f9cd 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -39,7 +39,7 @@
                            Path to access : Financial Management/Reporting/Legal Statements/Belgium Statements/Annual Listing Of VAT-Subjected Customers
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': [
                 'account',
                 'account_report',
diff --git a/addons/l10n_ch/account_invoice.xml b/addons/l10n_ch/account_invoice.xml
index e6602e686f8..37bdf170ceb 100644
--- a/addons/l10n_ch/account_invoice.xml
+++ b/addons/l10n_ch/account_invoice.xml
@@ -9,12 +9,12 @@
             <field name="arch" type="xml">
                 <field name="partner_id" position="replace">
                     <field name="partner_id"
-                        on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank)"
+                        on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id)"
                         select="1"/>
                 </field>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="invoice_supplier_form8">
             <field name="name">account.invoice.supplier.form.inherit</field>
             <field name="model">account.invoice</field>
@@ -22,10 +22,10 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="priority" eval="18"/>
             <field name="arch" type="xml">
-                <field name="partner_bank" position="replace">
-                    <field name="partner_bank"
+                <field name="partner_bank_id" position="replace">
+                    <field name="partner_bank_id"
                         domain="[('partner_id', '=', partner_id)]"
-                        on_change="onchange_partner_bank(partner_bank)"/>
+                        on_change="onchange_partner_bank(partner_bank_id)"/>
                 </field>
             </field>
         </record>
@@ -35,8 +35,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <field name="partner_bank" position="replace">
-                    <field name="partner_bank"
+                <field name="partner_bank_id" position="replace">
+                    <field name="partner_bank_id"
                         domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
                 </field>
             </field>
diff --git a/addons/l10n_ch/account_journal_view.xml b/addons/l10n_ch/account_journal_view.xml
index aa5d6c20080..5e681131e9c 100644
--- a/addons/l10n_ch/account_journal_view.xml
+++ b/addons/l10n_ch/account_journal_view.xml
@@ -8,24 +8,32 @@
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Account Journal</attribute>
+                  <attribute name="string">Account Journal Configuration</attribute>
                 </form>
+                <separator string="title" position="attributes">
+                    <attribute name="string">Configure Your Account Journal System</attribute>
+                </separator>
+                <xpath expr="//label[@string='description']"
+                 position="attributes">
+                <attribute name="string">Set accounts on financial journals defined by CamptoCamp l10n_ch module</attribute>
+                <attribute name="width">150</attribute>                
+                </xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                          <attribute name='rowspan'>15</attribute>
+                          <attribute name='string'></attribute>
+                </xpath>
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0"
-                         string="Set accounts on financial journals defined by CamptoCamp l10n_ch module"/>
-                  <separator colspan="4"/>
-                  <group colspan="4" col="6">
                     <field name="name" select="1"/>
-                  </group>
-                  <separator colspan="4" string="
-                    The accounts linked to the account journals"/>
-                  <field name="default_credit_account_id" select="1"
-                         on_change="on_change_credit(name, default_credit_account_id)"/>
-                  <field name="default_debit_account_id" select="1"
-                         on_change="on_change_debit(name, default_debit_account_id)"/>
+                    <group colspan="4">               
+                        <separator colspan="4" string="The accounts linked to the account journals"/>
+                        <field name="default_credit_account_id" select="1"
+                        on_change="on_change_credit(name, default_credit_account_id)"/>
+                        <field name="default_debit_account_id" select="1"
+                        on_change="on_change_debit(name, default_debit_account_id)"/>
+                    </group>
                 </group>
                 <xpath expr="//button[@name='action_next']" position="attributes">
-                  <attribute name="string">Next</attribute>
+                    <attribute name="string">Next</attribute>
                 </xpath>
               </data>
             </field>
diff --git a/addons/l10n_ch/account_move_line.py b/addons/l10n_ch/account_move_line.py
index 006b79d24f8..d326a98b611 100644
--- a/addons/l10n_ch/account_move_line.py
+++ b/addons/l10n_ch/account_move_line.py
@@ -57,8 +57,8 @@ class AccountMoveLine(osv.osv):
         bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type,
                 context=context)
         for line in self.browse(cr, uid, ids, context=context):
-            if line.invoice and line.invoice.partner_bank:
-                line2bank[line.id] = line.invoice.partner_bank.id
+            if line.invoice and line.invoice.partner_bank_id:
+                line2bank[line.id] = line.invoice.partner_bank_id.id
             elif line.partner_id:
                 for bank in line.partner_id.bank_ids:
                     if bank.state in bank_type:
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 3d707b3b39e..afdd93c703d 100644
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -40,27 +40,27 @@ class account_invoice(osv.osv):
     """Inherit account.invoice in order to add bvr
     printing functionnalites. BVR is a Swiss payment vector"""
     _inherit = "account.invoice"
-    
+
     ## @param self The object pointer.
     ## @param cursor a psycopg cursor
     ## @param user res.user.id that is currently loged
-    ## @parma context a standard dict 
+    ## @parma context a standard dict
     ## @return a list of tuple (name,value)
     def _get_reference_type(self, cursor, user, context=None):
-        """Function use by the function field reference_type in order to initalise available 
+        """Function use by the function field reference_type in order to initalise available
         BVR Reference Types"""
         res = super(account_invoice, self)._get_reference_type(cursor, user,
                 context=context)
         res.append(('bvr', 'BVR'))
         return res
-    
+
     ## @param self The object pointer.
     ## @param cursor a psycopg cursor
     ## @param user res.user.id that is currently loged
     ## @parma context a standard dict
-    ## @param name of the files 
-    ## @param args a list of diverse argument 
-    ## @parma context a standard dict 
+    ## @param name of the files
+    ## @param args a list of diverse argument
+    ## @parma context a standard dict
     ## @return a  dict (invoice id,amount to pay)
     def _amount_to_pay(self, cursor, user, ids, name, args, context=None):
         '''Return the amount still to pay regarding all the payment orders'''
@@ -81,8 +81,8 @@ class account_invoice(osv.osv):
         ### BVR reference type BVR or FREE
         'reference_type': fields.selection(_get_reference_type,
             'Reference Type', required=True),
-        ### Partner bank link between bank and partner id   
-        'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
+        ### Partner bank link between bank and partner id
+        'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
             help='The partner bank account to pay\nKeep empty to use the default'
             ),
         ### Amount to pay
@@ -91,12 +91,12 @@ class account_invoice(osv.osv):
             help='The amount which should be paid at the current date\n' \
                     'minus the amount which is already in payment order'),
     }
-    
+
     ## @param self The object pointer.
     ## @param cursor a psycopg cursor
     ## @param user res.user.id that is currently loged
     ## @parma ids invoices id
-    ## @return a boolean True if valid False if invalid 
+    ## @return a boolean True if valid False if invalid
     def _check_bvr(self, cr, uid, ids):
         """
         Function to validate a bvr reference like :
@@ -123,14 +123,14 @@ class account_invoice(osv.osv):
     ## @param cursor a psycopg cursor
     ## @param user res.user.id that is currently loged
     ## @parma ids invoices id
-    ## @return a boolean True if valid False if invalid 
+    ## @return a boolean True if valid False if invalid
     def _check_reference_type(self, cursor, user, ids):
-        """Check the customer invoice reference type depending 
+        """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):
             if invoice.type in 'in_invoice':
-                if invoice.partner_bank and \
-                        invoice.partner_bank.state in \
+                if invoice.partner_bank_id and \
+                        invoice.partner_bank_id.state in \
                         ('bvrbank', 'bvrpost') and \
                         invoice.reference_type != 'bvr':
                             return False
@@ -142,7 +142,7 @@ class account_invoice(osv.osv):
         (_check_reference_type, 'Error: BVR reference is required.',
             ['reference_type']),
     ]
-    
+
     ## @param self The object pointer.
     ## @param cr a psycopg cursor
     ## @param uid res.user.id that is currently loged
@@ -154,16 +154,16 @@ class account_invoice(osv.osv):
     ## @param partner_bank_id the partner linked invoice bank
     ## @return the dict of values with the partner_bank value updated
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank=False, company_id=False):
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         """ Function that is call when the partner of the invoice is changed
         it will retriev and set the good bank partner bank"""
         res = super(account_invoice, self).onchange_partner_id(
                                                                 cr,
-                                                                 uid, 
-                                                                 ids, 
+                                                                 uid,
+                                                                 ids,
                                                                  type,
-                                                                 partner_id, 
-                                                                 date_invoice, 
+                                                                 partner_id,
+                                                                 date_invoice,
                                                                  payment_term
                                                             )
         bank_id = False
@@ -173,19 +173,19 @@ class account_invoice(osv.osv):
                 bank_id = p.bank_ids[0].id
 
         if type in ('in_invoice', 'in_refund'):
-            res['value']['partner_bank'] = bank_id
+            res['value']['partner_bank_id'] = bank_id
 
-        if partner_bank != bank_id:
+        if partner_bank_id != bank_id:
             to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
             res['value'].update(to_update['value'])
         return res
-        
+
     ## @param self The object pointer.
     ## @param cursor a psycopg cursor
     ## @param user res.user.id that is currently loged
     ## @parma ids invoices id
     ## @param partner_bank_id the partner linked invoice bank
-    ## @return the dict of values with the reference type  value updated 
+    ## @return the dict of values with the reference type  value updated
     def onchange_partner_bank(self, cursor, user, ids, partner_bank_id):
         """update the reference type depending of the partner bank"""
         res = {'value': {}}
diff --git a/addons/l10n_ch/report/bvr.py b/addons/l10n_ch/report/bvr.py
index ffbe45d8e80..ce97ac1a1a7 100644
--- a/addons/l10n_ch/report/bvr.py
+++ b/addons/l10n_ch/report/bvr.py
@@ -34,7 +34,7 @@ import time
 from report import report_sxw
 from tools import mod10r
 import re
-import os 
+import os
 import sys
 import shutil
 from mx.DateTime import *
@@ -61,11 +61,11 @@ class account_invoice_bvr(report_sxw.rml_parse):
         if date_to_format:
             date_formatted = strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
         return date_formatted
-        
+
     def police_absolute_path(self, inner_path) :
         path = os.path.join(os.path.dirname(sys.argv[0]), inner_path)
         return  path
-        
+
     def copyocrbfile(self,file):
         src = self.police_absolute_path(file)
         file = os.path.basename(src)
@@ -74,10 +74,10 @@ class account_invoice_bvr(report_sxw.rml_parse):
             try:
                 shutil.copyfile(src,dest)
             except:
-                """print ocrbfile was not copy in /tmp/ please 
+                """print ocrbfile was not copy in /tmp/ please
                 copy it manually from l10_ch/report"""
-        
-            
+
+
 
     def comma_me(self,amount):
         if  type(amount) is float :
@@ -101,8 +101,8 @@ class account_invoice_bvr(report_sxw.rml_parse):
 
     def _get_ref(self, o):
         res = ''
-        if o.partner_bank.bvr_adherent_num:
-            res = o.partner_bank.bvr_adherent_num
+        if o.partner_bank_id.bvr_adherent_num:
+            res = o.partner_bank_id.bvr_adherent_num
         invoice_number = ''
         if o.number:
             invoice_number = re.sub('[^0-9]', '0', o.number)
diff --git a/addons/l10n_ch/report/bvr.rml b/addons/l10n_ch/report/bvr.rml
index a3eed479be9..b7e3388973a 100755
--- a/addons/l10n_ch/report/bvr.rml
+++ b/addons/l10n_ch/report/bvr.rml
@@ -13,7 +13,7 @@
             <stroke color="black"/>
             <lines>1.3cm 27.7cm 20cm 27.7cm</lines>
 
-            <drawRightString x="20cm" y="27.8cm">[[ company.rml_header1 ]] </drawRightString>            
+            <drawRightString x="20cm" y="27.8cm">[[ company.rml_header1 ]] </drawRightString>
             <drawString x="1.3cm" y="27.2cm">[[ company.partner_id.name ]]</drawString>
             <drawString x="1.3cm" y="26.8cm">[[ company.partner_id.address and company.partner_id.address[0].street or  '' ]]</drawString>
             <drawString x="1.3cm" y="26.4cm">[[ company.partner_id.address and company.partner_id.address[0].zip or '' ]] [[ company.partner_id.address and company.partner_id.address[0].city or '' ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name  or '']]</drawString>
@@ -112,11 +112,11 @@
 	-->
 	<illustration width="210mm" height="106mm">
 		<setFont name="Helvetica" size="11"/>
-        <drawString x="2mm" y="93mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.name or '' ]]</drawString>
-		<drawString x="2mm" y="88mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.zip or '']] [[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.city or '']]</drawString>
+        <drawString x="2mm" y="93mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.name or '' ]]</drawString>
+		<drawString x="2mm" y="88mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.zip or '']] [[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.city or '']]</drawString>
 
-		<drawString x="62mm" y="93mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.name or '' ]]</drawString>
-		<drawString x="62mm" y="88mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.zip or '']] [[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.city or '']]</drawString>
+		<drawString x="62mm" y="93mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.name or '' ]]</drawString>
+		<drawString x="62mm" y="88mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.zip or '']] [[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.city or '']]</drawString>
 
 		<drawString x="2mm" y="78mm">  [[ user.company_id.partner_id.name ]]</drawString>
 		<drawString x="2mm" y="73mm">  [[ user.company_id.partner_id.address[0].street ]]</drawString>
@@ -147,11 +147,11 @@
 		<drawString x="124mm" y="67mm">[[ _space(_get_ref(o)) ]]</drawString>
 
 		<setFont name="ocrb" size="12"/>
-        <drawRightString x="52 mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
-        <drawRightString x="112mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
+        <drawRightString x="52 mm" y="59.3mm">[[ o.partner_bank_id and o.partner_bank_id.printAccount and o.partner_bank_id.bvr_number or '' ]]</drawRightString>
+        <drawRightString x="112mm" y="59.3mm">[[ o.partner_bank_id and o.partner_bank_id.printAccount and o.partner_bank_id.bvr_number or '' ]]</drawRightString>
 		<drawRightString x="42mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[:-3], 1) + ' ' ]]</drawRightString>
 		<drawRightString x="104mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[:-3], 1) + ' ' ]]</drawRightString>
-        <drawRightString x="114 mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
+        <drawRightString x="114 mm" y="59.3mm">[[ o.partner_bank_id and o.partner_bank_id.printAccount and o.partner_bank_id.bvr_number or '' ]]</drawRightString>
 		<drawRightString x="58mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[-2:], 1) + ' ' ]]</drawRightString>
 		<drawRightString x="119mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[-2:], 1) + ' ' ]]</drawRightString>
 
@@ -161,7 +161,7 @@
 		-->
 
 		<setFont name="ocrb" size="11.5"/>
-	<drawRightString x="195mm" y="15mm">[[mod10r('01'+str('%.2f' % o.amount_total).replace('.','').rjust(10,'0'))]]&gt;[[ _get_ref(o) ]]+ [[o.partner_bank.bvr_number.split('-')[0]+(str(o.partner_bank.bvr_number.split('-')[1])).rjust(6,'0')+o.partner_bank.bvr_number.split('-')[2] ]]&gt;</drawRightString>
+	<drawRightString x="195mm" y="15mm">[[mod10r('01'+str('%.2f' % o.amount_total).replace('.','').rjust(10,'0'))]]&gt;[[ _get_ref(o) ]]+ [[o.partner_bank_id.bvr_number.split('-')[0]+(str(o.partner_bank_id.bvr_number.split('-')[1])).rjust(6,'0')+o.partner_bank_id.bvr_number.split('-')[2] ]]&gt;</drawRightString>
 	</illustration>
   </story>
 </document>
diff --git a/addons/l10n_ch/report/invoice.rml b/addons/l10n_ch/report/invoice.rml
index 104fbf2a367..bbc7c9dfdc4 100755
--- a/addons/l10n_ch/report/invoice.rml
+++ b/addons/l10n_ch/report/invoice.rml
@@ -250,7 +250,7 @@
       <blockTable colWidths="28.0, 499.0" style="Table4">
         <tr>
           <td>
-           <para style="P9">[[ note or removeParentNode('blockTable') ]]</para>            
+           <para style="P9">[[ note or removeParentNode('blockTable') ]]</para>
           </td>
           <td>
             <xpre style="P16">[[ l.note  ]]</xpre>
@@ -326,11 +326,11 @@
 	-->
 	<illustration width="210mm" height="106mm">
 		<setFont name="Helvetica" size="11"/>
-        <drawString x="2mm" y="93mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.name or '' ]]</drawString>
-		<drawString x="2mm" y="88mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.zip or '']] [[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.city or '']]</drawString>
+        <drawString x="2mm" y="93mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.name or '' ]]</drawString>
+		<drawString x="2mm" y="88mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.zip or '']] [[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.city or '']]</drawString>
 
-		<drawString x="62mm" y="93mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.name or '' ]]</drawString>
-		<drawString x="62mm" y="88mm">[[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.zip or '']] [[ o.partner_bank and o.partner_bank.printBank and o.partner_bank.bank and o.partner_bank.bank.city or '']]</drawString>
+		<drawString x="62mm" y="93mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.name or '' ]]</drawString>
+		<drawString x="62mm" y="88mm">[[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.zip or '']] [[ o.partner_bank_id and o.partner_bank_id.printBank and o.partner_bank_id.bank and o.partner_bank_id.bank.city or '']]</drawString>
 		<drawString x="2mm" y="78mm"> [[user.company_id.name]]</drawString>
 		<drawString x="2mm" y="73mm"> [[ user.company_id.partner_id.address[0].street ]]</drawString>
 		<drawString x="2mm" y="68mm"> [[ (user.company_id.partner_id.address[0].street2 or '')]]</drawString>
@@ -357,12 +357,12 @@
 
 
 		<setFont name="ocrb" size="11"/>
-        
+
 		<drawString x="124mm" y="67mm">[[ _space(_get_ref(o)) ]]</drawString>
 
 		<setFont name="ocrb" size="12"/>
-        <drawRightString x="52 mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
-        <drawRightString x="112mm" y="59.3mm">[[ o.partner_bank and o.partner_bank.printAccount and o.partner_bank.bvr_number or '' ]]</drawRightString>
+        <drawRightString x="52 mm" y="59.3mm">[[ o.partner_bank_id and o.partner_bank_id.printAccount and o.partner_bank_id.bvr_number or '' ]]</drawRightString>
+        <drawRightString x="112mm" y="59.3mm">[[ o.partner_bank_id and o.partner_bank_id.printAccount and o.partner_bank_id.bvr_number or '' ]]</drawRightString>
 		<drawRightString x="42mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[:-3], 1) + ' ' ]]</drawRightString>
 		<drawRightString x="104mm" y="50mm">[[ _space(('%.2f' % o.amount_total)[:-3], 1) + ' ' ]]</drawRightString>
 
@@ -375,7 +375,7 @@
 		-->
 
 		<setFont name="ocrb" size="11.5"/>
-	<drawRightString x="195mm" y="15mm">[[mod10r('01'+str('%.2f' % o.amount_total).replace('.','').rjust(10,'0'))]]&gt;[[ _get_ref(o) ]]+ [[o.partner_bank.bvr_number.split('-')[0]+(str(o.partner_bank.bvr_number.split('-')[1])).rjust(6,'0')+o.partner_bank.bvr_number.split('-')[2] ]]&gt;</drawRightString>
+	<drawRightString x="195mm" y="15mm">[[mod10r('01'+str('%.2f' % o.amount_total).replace('.','').rjust(10,'0'))]]&gt;[[ _get_ref(o) ]]+ [[o.partner_bank_id.bvr_number.split('-')[0]+(str(o.partner_bank_id.bvr_number.split('-')[1])).rjust(6,'0')+o.partner_bank_id.bvr_number.split('-')[2] ]]&gt;</drawRightString>
 
 	</illustration>
 
diff --git a/addons/l10n_ch/wizard/wizard_bvr.py b/addons/l10n_ch/wizard/wizard_bvr.py
index 15bdb85b356..9d7d74b1bc1 100644
--- a/addons/l10n_ch/wizard/wizard_bvr.py
+++ b/addons/l10n_ch/wizard/wizard_bvr.py
@@ -39,22 +39,22 @@ def _check(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     invoice_obj = pool.get('account.invoice')
     for invoice in invoice_obj.browse(cr, uid, data['ids'], context):
-        if not invoice.partner_bank:
+        if not invoice.partner_bank_id:
             raise wizard.except_wizard(_('UserError'),
                     _('No bank specified on invoice:\n%s') % \
                             invoice_obj.name_get(cr, uid, [invoice.id], context=context)[0][1])
 
         if not re.compile('[0-9][0-9]-[0-9]{3,6}-[0-9]').match(
-                invoice.partner_bank.bvr_number or ''):
+                invoice.partner_bank_id.bvr_number or ''):
             raise wizard.except_wizard(_('UserError'),
                     _('Your bank BVR number should be of the form 0X-XXX-X!\n' \
                             'Please check your company ' \
                             'information for the invoice:\n%s') % \
                             invoice_obj.name_get(cr, uid, [invoice.id], context=context)[0][1])
 
-        if invoice.partner_bank.bvr_adherent_num \
+        if invoice.partner_bank_id.bvr_adherent_num \
                 and not re.compile('[0-9]*$').match(
-                        invoice.partner_bank.bvr_adherent_num):
+                        invoice.partner_bank_id.bvr_adherent_num):
             raise wizard.except_wizard(_('UserError'),
                     _('Your bank BVR adherent number must contain exactly seven' \
                             'digits!\nPlease check your company ' \
@@ -65,7 +65,7 @@ def _check(self, cr, uid, data, context):
 class wizard_report(wizard.interface):
     states = {
         'init': {
-            'actions': [_check], 
+            'actions': [_check],
             'result': {'type':'print', 'report':'l10n_ch.bvr', 'state':'end'}
         }
     }
diff --git a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
index dbef21389bf..a0e080def06 100644
--- a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
+++ b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
@@ -62,14 +62,12 @@ class Tax_template(osv.osv_memory):
         }
 
     def _on_change(self, cr, uid, id, tax, vals):
-        if account:
-            self.pool.get('account.tax.template').write(
-                cr, uid, tax, vals=vals)
+        if tax:
+            self.pool.get('account.tax.template').write(cr, uid, tax, vals=vals)
         return {}
 
-    def on_change_collected(self, cr, uid, id, tax, account):
-        return self._on_change(
-            cr, uid, ids, tax, vals={'account_collected_id': account})
+    def on_change_collected(self, cr, uid, ids, tax, account):
+        return self._on_change(cr, uid, ids, tax, vals={'account_collected_id': account})
 
     def on_change_paid(self, cr, uid, id, tax, account):
         return self._on_change(
diff --git a/addons/l10n_chart_uk_minimal/account_chart.xml b/addons/l10n_chart_uk_minimal/account_chart.xml
index 804568afecc..17eae399ef8 100644
--- a/addons/l10n_chart_uk_minimal/account_chart.xml
+++ b/addons/l10n_chart_uk_minimal/account_chart.xml
@@ -22,21 +22,21 @@
         </record>
         
         <record model="account.account.template" id="assets_view">
-                <field name="name">Assets</field>
-                <field name="code">10</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="acct_type_asset_view"/>
-                <field name="reconcile" eval="False"/>
-                <field name="parent_id" ref="bal"/>
+            <field name="name">Assets</field>
+            <field name="code">10</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="acct_type_asset_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
         </record>
         
         <record model="account.account.template" id="liabilities_view">
-                <field name="name">Liabilities</field>
-                <field name="code">11</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="acct_type_liability_view"/>
-                <field name="reconcile" eval="False"/>
-                <field name="parent_id" ref="bal"/>
+            <field name="name">Liabilities</field>
+            <field name="code">11</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="acct_type_liability_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
         </record>
             
         <record id="fas" model="account.account.template">
@@ -156,21 +156,30 @@
         </record>
         
         <record model="account.account.template" id="income_view">
-                <field name="name">Income</field>
-                <field name="code">20</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="acct_type_income_view"/>
-                <field name="reconcile" eval="False"/>
-                <field name="parent_id" ref="gpf"/>
+            <field name="name">Income</field>
+            <field name="code">20</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="acct_type_income_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
+        </record>
+        
+        <record model="account.account.template" id="income_fx_income">
+            <field name="name">Foreign Exchange Gain</field>
+            <field name="code">X201</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="acct_type_income_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="income_view"/>
         </record>
         
         <record model="account.account.template" id="expense_view">
-                <field name="name">Expense</field>
-                <field name="code">21</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="acct_type_expense_view"/>
-                <field name="reconcile" eval="False"/>
-                <field name="parent_id" ref="gpf"/>
+            <field name="name">Expense</field>
+            <field name="code">21</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="acct_type_expense_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
         </record>
             
         <record id="rev" model="account.account.template">
@@ -225,10 +234,18 @@
             <field name="user_type" ref="account_type_expense"/>
         </record>
         
+        <record model="account.account.template" id="income_fx_expense">
+            <field name="name">Foreign Exchange Loss - (test)</field>
+            <field name="code">X2111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="ovr"/>
+        </record>
+        
         <!-- <record id="account.property_account_expense_categ" model="ir.property">
             <field eval="'account.account,'+str(a_expense)" name="value"/>
         </record> -->
         
-
     </data>
 </openerp>
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 55b5eb1ce1f..708f72d2147 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -28,7 +28,7 @@
 {
     "name" : "France - Plan Comptable Général",
     "version" : "1.0",
-    "author" : "OpenERP",
+    "author" : "OpenERP SA",
     "website": "http://www.openerp.com",
     "category" : "Localisation/Account Charts",
     "description": """This is the module to manage the accounting chart for France in Open ERP.
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index 334b94dad59..18791f9e0f4 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     "description":"""
     Indian Accounting : chart of Account
     """,
-    "author" : 'Tiny & Axelor',
+    "author" : 'OpenERP SA & Axelor',
     "category": "Localisation/Account Charts",
     "depends" : [
         "account",
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 391c75f01b4..d17d6b99828 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -30,7 +30,7 @@ This module installs:
     *the KLUWER Chart of Accounts,
     *the Tax Code Chart for Luxembourg
     *the main taxes used in Luxembourg""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['account', 'account_report', 'base_vat', 'base_iban'],
     'init_xml': [],
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index 46346889834..7ffbe191ba0 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -21,7 +21,7 @@
 
 {
     "name": "Lunch Module",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "Description": """
     The lunch module is for keeping record of the order placed and payment of the orders.
     The products are defined under categories and the payment records are maintained user wise
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 5eea9a13d4a..5d0fe20c801 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -45,7 +45,7 @@
             <field name="model">lunch.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Order">
+                <tree colors="blue:state in ('draft');black:state in ('confirmed')" string="Order">
                     <field name="user_id"/>
                     <field name="product"/>
                     <field name="date"/>
@@ -62,7 +62,7 @@
                               name="%(action_lunch_order_cancel)d"
                               string="Cancel Order"
                               type="action" states="confirmed"
-                              icon="terp-gtk-stop" />
+                              icon="gtk-cancel" />
                 </tree>
             </field>
         </record>
diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py
index aa08c7f190d..961f16f541f 100644
--- a/addons/mail_gateway/__openerp__.py
+++ b/addons/mail_gateway/__openerp__.py
@@ -26,7 +26,7 @@
     'description': """The generic email gateway system allows to send and receive emails
     * History for Emails
     * Easy Integration with any Module""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 7187de5d1a5..ef36be3a3ef 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -41,8 +41,7 @@ class mailgate_thread(osv.osv):
     _description = 'Mailgateway Thread'
 
     _columns = {
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True)]),
-        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False)]),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', readonly=True),
     }
 
     def message_new(self, cr, uid, msg, context):
@@ -141,31 +140,58 @@ class mailgate_thread(osv.osv):
         return True
 mailgate_thread()
 
+def format_date_tz(date, tz=None):
+    if not date: 
+        return 'n/a'
+    format = tools.DEFAULT_SERVER_DATETIME_FORMAT
+    return tools.server_to_local_timestamp(date, format, format, tz)
+
 class mailgate_message(osv.osv):
     '''
     Mailgateway Message
     '''
+    def _get_display_text(self, cr, uid, ids, name, arg, context=None):
+        if context is None:
+            context = {}
+        tz = context.get('tz')
+        result = {}
+        for message in self.browse(cr, uid, ids, context=context):
+            msg_txt = ''
+            if message.history:
+                msg_txt += (message.email_from or '/') + ' wrote on ' + format_date_tz(message.date, tz) + ':\n\t'
+                if message.description:
+                    msg_txt += '\n\t'.join(message.description.split('\n')[:3]) + '...'
+            else:
+                msg_txt = (message.user_id.name or '/') + '  on ' + format_date_tz(message.date, tz) + ':\n\t'
+                if message.name == 'Opportunity':
+                    msg_txt += "Converted to Opportunity"
+                else:
+                    msg_txt += "Changed Status to: " + message.name
+            result[message.id] = msg_txt
+        return result
+
     _name = 'mailgate.message'
     _description = 'Mailgateway Message'
-    _order = 'id desc'
+    _order = 'date desc'
     _columns = {
-        'name':fields.text('Subject'),
-        'model': fields.char('Object Name', size=128, select=1),
-        'res_id': fields.integer('Resource ID', select=1),
+        'name':fields.text('Subject', readonly=True),
+        'model': fields.char('Object Name', size=128, select=1, readonly=True),
+        'res_id': fields.integer('Resource ID', select=1, readonly=True),
         'ref_id': fields.char('Reference Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
-        'date': fields.datetime('Date'),
-        'history': fields.boolean('Is History?'),
+        'date': fields.datetime('Date', readonly=True),
+        'history': fields.boolean('Is History?', readonly=True),
         'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
-        'message': fields.text('Description'),
-        'email_from': fields.char('From', size=128, help="Email From"),
-        'email_to': fields.char('To', help="Email Recipients", size=256),
-        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256),
-        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256),
+        'message': fields.text('Description', readonly=True),
+        'email_from': fields.char('From', size=128, help="Email From", readonly=True),
+        'email_to': fields.char('To', help="Email Recipients", size=256, readonly=True),
+        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256, readonly=True),
+        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256, readonly=True),
         'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email.", select=True),
         'references': fields.text('References', readonly=True, help="References emails."),
-        'description': fields.text('Description'),
+        'description': fields.text('Description', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', required=False),
-        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
+        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
+        'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'), 
     }
 
     def init(self, cr):
@@ -459,7 +485,7 @@ class mailgate_tool(osv.osv_memory):
             'partner_id': False
         }
         from_email = self.to_email(from_email)[0]
-        address_ids = address_pool.search(cr, uid, [('email', '=', from_email)])
+        address_ids = address_pool.search(cr, uid, [('email', 'like', from_email)])
         if address_ids:
             address = address_pool.browse(cr, uid, address_ids[0])
             res['partner_address_id'] = address_ids[0]
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 415dc192e50..fb70a08efc3 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -79,41 +79,10 @@
                     <group col="6" colspan="4">
                         <field name="thread" select="1" colspan="3"/>
                     </group>
-                    <separator string="Logs" colspan="4"/>
-                    <field name="log_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
-                        <tree string="Mailgateway Logs">
-                            <field name="name" select="1" />
-                            <field name="date" />
-                        </tree>
-                        <form string="Mailgate Logs">
-                            <field name="name"  widget="char" size="512"/>
-                            <field name="date" />
-                            <field name="user_id" />
-                            <field name="message_id" />
-                            <notebook colspan="4">
-                                <page string="Email Details">
-                                    <group col="4" colspan="4">
-                                        <separator string="Email Details" colspan="4"/>
-                                        <field name="email_from" />
-                                        <field name="email_to" widget="char" size="512"/>
-                                        <field name="email_cc" widget="char" size="512"/>
-                                        <field name="email_bcc" widget="char" size="512"/>
-                                   </group>
-                                   <separator string="Description" colspan="4"/>
-                                    <field name="description" nolabel="1" colspan="4" />
-                                </page>
-                                <page string="Attachments">
-                                    <separator string="Attachments" colspan="4"/>
-                                    <field name="attachment_ids" nolabel="1" colspan="4" />
-                                </page>
-                            </notebook>
-                        </form>
-                    </field>
                     <separator string="History" colspan="4"/>
-                    <field name="message_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
+                    <field name="message_ids" nolabel="1" colspan="4" mode="tree,form">
                         <tree string="Mailgateway History">
-                            <field name="name" select="1" />
-                            <field name="date" />
+                            <field name="display_text" />
                         </tree>
                         <form string="Mailgate History">
                             <field name="name" widget="char" size="512"/>
@@ -208,7 +177,7 @@
             <field name="act_window_id" ref="action_view_mailgate_thread"/>
         </record>
 
-        <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
+        <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="4"/>
         <menuitem id="menu_mailgate_message" name="Emails" action="action_view_mailgate_message"
            parent="base.menu_base_config_mail" sequence="5"/>
 
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index e3890ffe8f6..16127d2d343 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Marketing",
     "version" : "1.1",
     "depends" : ["base"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules/Marketing',
     "description": "Menu for Marketing",
     'website': 'http://www.openerp.com',
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index a3288fb471f..1735d6464fe 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="17"
+        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"
             groups="group_marketing_user"/>
 
         <record id="view_marketing_installer" model="ir.ui.view">
@@ -13,7 +13,7 @@
             <field name="arch" type="xml">
                 <data>
                   <form position="attributes">
-                    <attribute name="string">Marketing Modules Installation</attribute>
+                    <attribute name="string">Marketing Modules Configuration</attribute>
                   </form>
                   <separator string="title" position="attributes">
                     <attribute name="string">Select Marketing Modules to Install</attribute>
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 3b72f183f89..787557145e3 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -26,6 +26,7 @@ from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 from traceback import format_exception
 from sys import exc_info
+from tools.safe_eval import safe_eval as eval
 
 from osv import fields, osv
 import netsvc
@@ -90,15 +91,15 @@ this campaign to be run"),
         'partner_field_id': fields.many2one('ir.model.fields', 'Partner Field',
                                             domain="[('model_id', '=', object_id), ('ttype', '=', 'many2one'), ('relation', '=', 'res.partner')]",
                                             help="The generated workitems will be linked to the partner related to the record. If the record is the partner itself left this field empty."),
-        'mode':fields.selection([('test', 'Test Directly'),
+        'mode': fields.selection([('test', 'Test Directly'),
                                 ('test_realtime', 'Test in Realtime'),
                                 ('manual', 'With Manual Confirmation'),
                                 ('active', 'Normal')],
                                  'Mode', required=True, help= \
-"""Test - It creates and process all the activities directly (without waiting for the delay on transitions) but do not send emails or produce reports.
-Test in Realtime - It creates and process all the activities directly but do not send emails or produce reports.
+"""Test - It creates and process all the activities directly (without waiting for the delay on transitions) but does not send emails or produce reports.
+Test in Realtime - It creates and processes all the activities directly but does not send emails or produce reports.
 With Manual Confirmation - the campaigns runs normally, but the user has to validate all workitem manually.
-Normal - the campaign runs normally and automatically sends all emails and reports"""),
+Normal - the campaign runs normally and automatically sends all emails and reports (be very careful with this mode, you're live!)"""),
         'state': fields.selection([('draft', 'Draft'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
@@ -106,9 +107,9 @@ Normal - the campaign runs normally and automatically sends all emails and repor
                                    'State',),
         'activity_ids': fields.one2many('marketing.campaign.activity',
                                        'campaign_id', 'Activities'),
-        'fixed_cost': fields.float('Fixed Cost', help="The fixed cost is cost\
-you required for the campaign"),
+        'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for the campaign (used for campaign analysis), see also variable cost on activities"),
     }
+    
     _defaults = {
         'state': lambda *a: 'draft',
         'mode': lambda *a: 'test',
@@ -117,23 +118,30 @@ you required for the campaign"),
     def state_running_set(self, cr, uid, ids, *args):
         # TODO check that all subcampaigns are running
         campaign = self.browse(cr, uid, ids[0])
-        if not campaign.activity_ids :
-            raise osv.except_osv("Error", "There is no activitity in the campaign")
-        actvity_ids = [ act_id.id for act_id in campaign.activity_ids]
-        act_obj = self.pool.get('marketing.campaign.activity')
-        act_ids  = act_obj.search(cr, uid, [('id', 'in', actvity_ids),
-                                                    ('start', '=', True)])
-        if not act_ids :
-            raise osv.except_osv("Error", "There is no starting activitity in the campaign")
-        act_ids = act_obj.search(cr, uid, [('id', 'in', actvity_ids),
-                                            ('type', '=', 'email')])
-        for activity in act_obj.browse(cr, uid, act_ids):
-            if not activity.email_template_id.enforce_from_account :
-                raise osv.except_osv("Error", "Campaign cannot be start : Email Account is missing in email activity")
-            if activity.email_template_id.enforce_from_account.state != 'approved' :
-                raise osv.except_osv("Error", "Campaign cannot be start : Email Account is not approved for email activity")
-        self.write(cr, uid, ids, {'state': 'running'})
-        return True
+
+        if not campaign.activity_ids:
+            raise osv.except_osv(_("Error"), _("The campaign cannot be started: there are no activities in it"))
+
+        has_start = False
+        has_signal_without_from = False
+
+        for activity in campaign.activity_ids:
+            if activity.start:
+                has_start = True
+            if activity.signal and len(activity.from_ids) == 0:
+                has_signal_without_from = True
+
+            if activity.type != 'email':
+                continue
+            if not activity.email_template_id.enforce_from_account:
+                raise osv.except_osv(_("Error"), _("The campaign cannot be started: an email account is missing in the email activity '%s'")%activity.name)
+            if activity.email_template_id.enforce_from_account.state != 'approved':
+                raise osv.except_osv(_("Error"), _("The campaign cannot be started: the email account is not approved in the email activity '%s'")%activity.name)
+
+        if not has_start and not has_signal_without_from:
+            raise osv.except_osv(_("Error"), _("The campaign hasn't any starting activity nor any activity with a signal and no previous activity."))
+
+        return self.write(cr, uid, ids, {'state': 'running'})
 
     def state_done_set(self, cr, uid, ids, *args):
         # TODO check that this campaign is not a subcampaign in running mode.
@@ -141,7 +149,7 @@ you required for the campaign"),
                                             [('campaign_id', 'in', ids),
                                             ('state', '=', 'running')])
         if segment_ids :
-            raise osv.except_osv("Error", "Campaign cannot be marked as done before all segments are done")
+            raise osv.except_osv(_("Error"), _("The campaign cannot be marked as done before all segments are done"))
         self.write(cr, uid, ids, {'state': 'done'})
         return True
 
@@ -152,29 +160,44 @@ you required for the campaign"),
 
 
     def signal(self, cr, uid, model, res_id, signal, context=None):
+        record = self.pool.get(model).browse(cr, uid, res_id, context)
+        return self._signal(cr, uid, record, signal, context)
+
+    def _signal(self, cr, uid, record, signal, context=None):
         if not signal:
             raise ValueError('signal cannot be False')
 
         Workitems = self.pool.get('marketing.campaign.workitem')
-        domain = [('object_id.model', '=', model),
+        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 activity in campaign.activity_ids:
                 if activity.signal != signal:
                     continue
-                wi_domain = [('activity_id', '=', activity.id),
-                             ('res_id', '=', res_id),
-                             ('state', '=', 'todo'),
-                             ('date', '=', False),
-                            ]
+
+                data = dict(activity_id=activity.id,
+                            res_id=record.id,
+                            state='todo')
+                wi_domain = [(k, '=', v) for k, v in data.items()]
+
                 wi_ids = Workitems.search(cr, uid, wi_domain, context=context)
+                if not wi_ids:
+                    partner = self._get_partner_for(campaign, record)
+                    if partner:
+                        data['partner_id'] = partner.id
+                    wi_id = Workitems.create(cr, uid, data, context=context)
+                    wi_ids = [wi_id]
                 Workitems.process(cr, uid, wi_ids, context=context)
         return True
 
-    def _signal(self, cr, uid, record, signal, context=None):
-        return self.signal(cr, uid, record._table._name,
-                           record.id, signal, context)
+    def _get_partner_for(self, campaign, record):
+        partner_field = campaign.partner_field_id.name
+        if partner_field:
+            return getattr(record, partner_field)
+        elif campaign.object_id.model == 'res.partner':
+            return record
+        return None
 
 marketing_campaign()
 
@@ -191,9 +214,10 @@ class marketing_campaign_segment(osv.osv):
                                       string='Object'),
         'ir_filter_id': fields.many2one('ir.filters', 'Filter', help=""),
         'sync_last_date': fields.datetime('Latest Synchronization'),
-        'sync_mode': fields.selection([('create_date', 'Sync only on creation'),
-                                      ('write_date', 'Sync at each modification')],
-                                      'Synchronization Mode'),
+        'sync_mode': fields.selection([('create_date', 'If record created after last sync'),
+                                      ('write_date', 'If record modified after last sync (no duplicates)')],
+                                      'Workitem creation mode',
+                                      help="Determines when new workitems should be created for records matching a segment."),
         'state': fields.selection([('draft', 'Draft'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
@@ -247,7 +271,6 @@ class marketing_campaign_segment(osv.osv):
                   uid, [('start', '=', True), ('campaign_id', '=', segment.campaign_id.id)], context=context)
 
             model_obj = self.pool.get(segment.object_id.model)
-            partner_field = segment.campaign_id.partner_field_id.name
             criteria = []
             if segment.sync_last_date:
                 criteria += [(segment.sync_mode, '>', segment.sync_last_date)]
@@ -255,6 +278,7 @@ class marketing_campaign_segment(osv.osv):
                 criteria += eval(segment.ir_filter_id.domain)
             object_ids = model_obj.search(cr, uid, criteria, context=context)
 
+            # XXX TODO: rewrite this loop more efficiently without doing 1 search per record!
             for o_ids in model_obj.browse(cr, uid, object_ids, context=context):
                 # avoid duplicated workitem for the same resource
                 if segment.sync_mode == 'write_date':
@@ -269,11 +293,7 @@ class marketing_campaign_segment(osv.osv):
                     'res_id': o_ids.id
                 }
 
-                partner = None
-                if partner_field:
-                    partner = getattr(o_ids, partner_field)
-                elif model_obj._name == 'res.partner':
-                    partner = o_ids
+                partner = self.pool.get('marketing.campaign')._get_partner_for(segment.campaign_id, o_ids)
                 if partner:
                     wi_vals['partner_id'] = partner.id
 
@@ -295,9 +315,7 @@ class marketing_campaign_activity(osv.osv):
         ('email', 'E-mail'),
         ('paper', 'Paper'),
         ('action', 'Action'),
-        # TODO implement the subcampaigns. The segment_id on woritems must be
-        # optional (thus campaign_id must be a real many2one, and a constraint
-        # must be set). 
+        # TODO implement the subcampaigns.
         # TODO implement the subcampaign out. disallow out transitions from
         # subcampaign activities ?
         #('subcampaign', 'Sub-Campaign'),
@@ -310,9 +328,9 @@ class marketing_campaign_activity(osv.osv):
         'object_id': fields.related('campaign_id','object_id',
                                       type='many2one', relation='ir.model',
                                       string='Object', readonly=True),
-        'start': fields.boolean('Start',help= "This activity is launched when the campaign starts."),
+        'start': fields.boolean('Start', help= "This activity is launched when the campaign starts.", select=True),
         'condition': fields.char('Condition', size=256, required=True,
-                                 help="Python condition to know if the activity can be launched"),
+                                 help="Python condition to know if the activity can be executed, otherwise it will be deleted or cancelled."),
         'type': fields.selection(_action_types, 'Type', required=True,
                                   help="Describe type of action to be performed on the Activity.Eg : Send email,Send paper.."),
         'email_template_id': fields.many2one('email.template','Email Template'),
@@ -333,8 +351,9 @@ class marketing_campaign_activity(osv.osv):
         'variable_cost': fields.float('Variable Cost'),
         'revenue': fields.float('Revenue'),
         'signal': fields.char('Signal', size=128,
-                              help='An activity with a signal can be called \
-                                      programmatically'),
+                              help='An activity with a signal can be called programmatically. Be careful, the workitem is always created when a signal is sent'),
+        'keep_if_condition_not_met': fields.boolean('Keep as cancelled when condition not met',
+                                                    help="By activating this option, workitems that aren't executed because the condition is not met are marked as cancelled instead of being deleted.")
     }
 
     _defaults = {
@@ -342,20 +361,6 @@ class marketing_campaign_activity(osv.osv):
         'condition': lambda *a: 'True',
     }
 
-    def _check_signal(self, cr, uid, ids, context=None):
-        return all(activity.signal
-                   for activity in self.browse(cr, uid, ids, context)
-                   for transition in activity.from_ids
-                   if transition.trigger == 'signal')
-
-    _constraints = [
-        (_check_signal,
-         "An incoming transition is triggered by a signal but this transition \
-                doesn't have one",
-         ['signal', 'from_ids']
-        ),
-    ]
-
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
                                         context=None, count=False):
         if context == None:
@@ -431,7 +436,7 @@ class marketing_campaign_transition(osv.osv):
         formatters = {
             'auto': _('Automatic transition'),
             'time': _('After %(interval_nbr)d %(interval_type)s'),
-            'signal': _('On signal'),
+            'cosmetic': _('Cosmetic'),
         }
         for tr in self.browse(cr, uid, ids, context=context,
                               fields_process=translate_selections):
@@ -462,9 +467,10 @@ class marketing_campaign_transition(osv.osv):
 
         'trigger': fields.selection([('auto', 'Automatic'),
                                      ('time', 'Time'),
-                                     ('signal','Signal')],
+                                     ('cosmetic', 'Cosmetic'),  # fake plastic transition
+                                    ],
                                     'Trigger', required=True,
-                                    help="How is trigger the destination workitem"),
+                                    help="How is the destination workitem triggered"),
     }
 
     _defaults = {
@@ -477,20 +483,6 @@ class marketing_campaign_transition(osv.osv):
         ('interval_positive', 'CHECK(interval_nbr >= 0)', 'The interval must be positive or zero')
     ]
 
-    def _check_signal(self, cr, uid, ids, context=None):
-        return all(tr.activity_to_id.signal
-                   for tr in self.browse(cr, uid, ids, context)
-                   if tr.trigger == 'signal')
-
-    _constraints = [
-        (_check_signal,
-         "The transition is triggered by a signal but destination activity \
-                doesn't have one",
-         ['trigger', 'activity_to_ids']
-        ),
-    ]
-
-
 marketing_campaign_transition()
 
 class marketing_campaign_workitem(osv.osv):
@@ -510,13 +502,12 @@ class marketing_campaign_workitem(osv.osv):
         return res
 
     _columns = {
-        'segment_id': fields.many2one('marketing.campaign.segment', 'Segment',
-             required=True),
+        'segment_id': fields.many2one('marketing.campaign.segment', 'Segment'),
         'activity_id': fields.many2one('marketing.campaign.activity','Activity',
              required=True),
-        'campaign_id': fields.related('segment_id', 'campaign_id',
+        'campaign_id': fields.related('activity_id', 'campaign_id',
              type='many2one', relation='marketing.campaign', string='Campaign', readonly=True),
-        'object_id': fields.related('segment_id', 'campaign_id', 'object_id',
+        'object_id': fields.related('activity_id', 'campaign_id', 'object_id',
              type='many2one', relation='ir.model', string='Object', select=1),
         'res_id': fields.integer('Resource ID', select=1, readonly=1),
         'res_name': fields.function(_res_name_get, method=True, string='Resource Name', type="char", size=64),
@@ -535,7 +526,7 @@ class marketing_campaign_workitem(osv.osv):
 
     def button_draft(self, cr, uid, workitem_ids, context={}):
         for wi in self.browse(cr, uid, workitem_ids, context=context):
-            if wi.state=='exception':
+            if wi.state in ('exception', 'cancelled'):
                 self.write(cr, uid, [wi.id], {'state':'todo'}, context=context)
         return True
 
@@ -550,13 +541,13 @@ class marketing_campaign_workitem(osv.osv):
             return
 
         activity = workitem.activity_id
+        proxy = self.pool.get(workitem.object_id.model)
+        object_id = proxy.browse(cr, uid, workitem.res_id, context=context)
 
         eval_context = {
-            'pool': self.pool,
-            'cr': cr,
-            'uid': uid,
-            'wi': workitem,
-            'object': activity,
+            'activity': activity,
+            'workitem': workitem,
+            'object': object_id,
             'transition': activity.to_ids
         }
         try:
@@ -564,7 +555,10 @@ class marketing_campaign_workitem(osv.osv):
             campaign_mode = workitem.campaign_id.mode
             if condition:
                 if not eval(condition, eval_context):
-                    workitem.write({'state': 'cancelled'}, context=context)
+                    if activity.keep_if_condition_not_met:
+                        workitem.write({'state': 'cancelled'}, context=context)
+                    else:
+                        workitem.unlink(context=context)
                     return
             result = True
             if campaign_mode in ('manual', 'active'):
@@ -580,6 +574,8 @@ class marketing_campaign_workitem(osv.osv):
             if result:
                 # process _chain
                 for transition in activity.to_ids:
+                    if transition.trigger == 'cosmetic':
+                        continue
                     launch_date = False
                     if transition.trigger == 'auto':
                         launch_date = datetime.now()
@@ -599,13 +595,13 @@ class marketing_campaign_workitem(osv.osv):
                     wi_id = self.create(cr, uid, values, context=context)
 
                     # Now, depending of the trigger and the campaign mode 
-                    # we now if must run the newly created workitem.
+                    # we know if must run the newly created workitem.
                     #
                     # rows = transition trigger \ colums = campaign mode
                     #
                     #           test    test_realtime     manual      normal (active)
                     # time       Y            N             N           N
-                    # signal     N            N             N           N
+                    # cosmetic   N            N             N           N
                     # auto       Y            Y             Y           Y
                     # 
 
@@ -678,8 +674,9 @@ class marketing_campaign_workitem(osv.osv):
                 'type' : 'ir.actions.report.xml',
                 'report_name': wi_obj.activity_id.report_id.report_name,
                 'datas' : datas,
-                'nodestroy': True,
             }
+        else:
+            raise osv.except_osv(_('No preview'),_('The current step for this item has no email or report to preview.'))
         return res
 
 marketing_campaign_workitem()
@@ -689,6 +686,9 @@ class email_template(osv.osv):
     _defaults = {
         'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
     }
+    
+    # TODO: add constraint to prevent disabling / disapproving an email account used in a running campaign
+     
 email_template()
 
 class report_xml(osv.osv):
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 4ac70292c32..cf50c4cd6ac 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-    <menuitem name="Configuration" id="menu_marketing_configuration" parent="marketing.marketing_menu" sequence="1"/>
+    <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
 
     <!--
     ======================
@@ -27,8 +27,8 @@
                 <separator string="Status" colspan="4" />
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" select="2" nolabel="1"/>
-                    <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
-                    <button name="state_done_set" string="Done" states="running" icon="gtk-ok"/>
+                    <button name="state_running_set" string="Run" states="draft,done,cancelled" icon="gtk-apply"/>
+                    <button name="state_done_set" string="Close" states="running" icon="gtk-ok"/>
                     <button name="state_cancel_set" string="Cancelled" states="running" icon="gtk-cancel"/>
                 </group>
               </form>
@@ -40,7 +40,7 @@
         <field name="model">marketing.campaign</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Campaigns">
+            <tree colors="blue:state in ('draft');black:state in ('running');gray:state in ('done','cancelled')" string="Campaigns">
                 <field name="name" select="1"/>
                 <field name="object_id" select="1"/>
                 <field name="mode"/>
@@ -106,7 +106,7 @@
 
     </record>
 
-    <menuitem name="Campaigns" id="menu_marketing_campaign" parent="marketing.marketing_menu"/>
+    <menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/>
     <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="10" />
 
     <!--
@@ -142,7 +142,7 @@
                 <separator string="Status" colspan="4"/>
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" select="2" nolabel="1"/>
-                    <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
+                    <button name="state_running_set" string="Run" states="draft,done,cancelled" icon="gtk-apply"/>
                     <button name="state_done_set" string="Close" states="running" icon="gtk-ok"/>
                     <button name="state_cancel_set" string="Cancel" states="running" icon="gtk-cancel"/>
                 </group>
@@ -155,7 +155,7 @@
         <field name="model">marketing.campaign.segment</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Segments">
+            <tree colors="blue:state in ('draft');black:state in ('running');gray:state in ('done','cancelled')" string="Segments">
                 <field name="name"/>
                 <field name="campaign_id"/>
                 <field name="date_run"/>
@@ -224,27 +224,27 @@
                 <field name="signal"/>
                 <field name="start"/>
                 <field name="variable_cost" select="1"/>
-                <newline/> 
-                
+                <newline/>
+
                 <separator string="Action" colspan="4"/>
                 <group colspan='4' col='4'>
-                    <field name="condition" colspan='4'/>
+                    <group colspan="4" col="6">
+                        <field name="condition" colspan='5'/>
+                        <group col='2'>
+                            <field name="keep_if_condition_not_met" />
+                        </group>
+                    </group>
                     <field name="type" width='100'/>
                     <group colspan='2' col='1'>
-                        <group attrs="{'invisible':[('type','!=','email')]}" >
-                            <field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
-                        </group>
+                        <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
+                               context="{'default_object_name':object_id}" />
                         <group attrs="{'invisible':[('type','!=','paper')]}" >
                             <field name="report_id" attrs="{'required':[('type','=','paper')]}" context="{'object_id':object_id}"/>
                             <field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
                         </group>
-                        <group attrs="{'invisible':[('type','!=','action')]}" >
-                            <field name="server_action_id" attrs="{'required':[('type','=','action')]}" domain="[('model_id','=',object_id)]" />
-                        </group>
+                        <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]" />
                         <!--
-                        <group attrs="{'invisible':[('type','!=','subcampaign')]}" >
-                            <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
-                        </group>
+                         <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')], 'invisible':[('type','!=','subcampaign')]}" />
                         -->
                     </group>
                 </group>
@@ -272,7 +272,7 @@
             </form>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_marketing_campaign_activity_tree">
         <field name="name">marketing.campaign.activity.tree</field>
         <field name="model">marketing.campaign.activity</field>
@@ -299,15 +299,15 @@
         <field name="model">marketing.campaign.workitem</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Marketing Campaign Activities">
+            <tree colors="red:state in ('exception');black:state in ('todo');gray:state in ('cancelled')" string="Marketing Campaign Activities">
                 <field name="segment_id"/>
                 <field name="activity_id" />
                 <field name="res_name" />
                 <field name="partner_id"/>
                 <field name="date"/>
                 <field name="state"/>
-                <button string="Preview" states="todo" name="preview" icon="gtk-apply" type="object"/>
-                <button string="Process" states="todo" name="process" type="object" icon="gtk-ok"/>
+                <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
+                <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
                 <button string="Cancel" states="todo" name="button_cancel" type="object" icon="gtk-cancel"/>
             </tree>
         </field>
@@ -335,7 +335,7 @@
                         <separator string="Date" colspan="2"/>
                         <field name="date"/>
                         <label string="" colspan="1"/>
-                        <button string="Preview" states="todo" name="preview" icon="gtk-apply" type="object"/>
+                        <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
                     </group>
                 </group>
                 <group colspan="4" col="4" attrs="{'invisible':[('state','!=','exception')]}">
@@ -345,8 +345,8 @@
                 <separator string="Status" colspan="4"/>
                 <group colspan="4" col="11">
                     <field name="state" nolabel="1" readonly="True" select="1"/>
-                    <button string="Retry" states="exception" name="button_draft" type="object" icon="gtk-ok"/>
-                    <button string="Process" states="todo" name="process" type="object" icon="gtk-ok"/>
+                    <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
+                    <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
                     <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="gtk-cancel"/>
                 </group>
             </form>
@@ -379,7 +379,7 @@
    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
-        <field name="name">Campaign Activities (Workitems)</field>
+        <field name="name">Campaign Followup</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">marketing.campaign.workitem</field>
         <field name="view_type">form</field>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index fb83e12a225..ec92ec83326 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -79,8 +79,8 @@
         <field name="search_view_id" ref="view_campaign_analysis_search"/>
     </record>
 
-    <menuitem name="Reporting" id="menu_marketing_reporting" parent="marketing.marketing_menu"/>
-    <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing_reporting" sequence="40"/>
+    <menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu"/>
+    <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="base.menu_report_association" sequence="2"/>
 
     </data>
 </openerp>
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index f67a747e518..6b78a82c977 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+        <record id="action_dummy" model="ir.actions.server">
+            <field name="name">Dummy Action</field>
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="state">dummy</field>
+            <field name="code"></field>
+            <field eval="5" name="sequence"/>
+            <field eval="True" name="condition"/>
+        </record>
+    </data>
+    <data>
 
 <!-- Document directory -->
         <record id="document_directory_marketingcampaign" model="document.directory">
@@ -178,7 +188,7 @@
 
         <record id="marketing_campaign_activity_0" model="marketing.campaign.activity">
             <field name="name">Propose a 1 month free trial for an OnDemand offer</field>
-            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field name="server_action_id" ref="action_dummy"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="report_directory_id" ref="document_directory_campaign1"/>
             <field name="type">paper</field>
@@ -187,27 +197,27 @@
         </record>
         <record id="marketing_campaign_activity_1" model="marketing.campaign.activity">
             <field name="name">Thanks for showing interest</field>
-            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field name="server_action_id" ref="action_dummy"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_1"/>
         </record>
 
         <record id="marketing_campaign_activity_2" model="marketing.campaign.activity">
             <field name="name">Propose to subscribe to the Open ERP Discovery Day on May 2010</field>
-            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field name="server_action_id" ref="action_dummy"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
              <field name="email_template_id" ref="email_template_2"/>
         </record>
 
         <record id="marketing_campaign_activity_3" model="marketing.campaign.activity">
             <field name="name">Thanks for subscribing to the Open ERP Discovery Day</field>
-            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field name="server_action_id" ref="action_dummy"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_3"/>
         </record>
         <record id="marketing_campaign_activity_4" model="marketing.campaign.activity">
             <field name="name">Propose to buy the Open ERP Book</field>
-           <field name="server_action_id" ref="base.action_start_configurator"/>
+           <field name="server_action_id" ref="action_dummy"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="report_directory_id" ref="document_directory_campaign1"/>
             <field name="type">paper</field>
@@ -216,33 +226,33 @@
 
         <record id="marketing_campaign_activity_5" model="marketing.campaign.activity">
             <field name="name">Thanks for buying the Open ERP book</field>
-            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field name="server_action_id" ref="action_dummy"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_4"/>
         </record>
         <record id="marketing_campaign_activity_6" model="marketing.campaign.activity">
             <field name="name">Propose a free technical training to Gold partners</field>
-            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field name="server_action_id" ref="action_dummy"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_5"/>
         </record>
         <record id="marketing_campaign_activity_7" model="marketing.campaign.activity">
             <field name="name">Propose paid training to Silver partners</field>
-            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field name="server_action_id" ref="action_dummy"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_6"/>
         </record>
 
         <record id="marketing_campaign_activity_8" model="marketing.campaign.activity">
             <field name="name">Propose gold partnership to silver partners</field>
-            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field name="server_action_id" ref="action_dummy"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_7"/>
         </record>
 
          <record id="marketing_campaign_activity_9" model="marketing.campaign.activity">
             <field name="name">Thanks for subscribing to technical training</field>
-            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field name="server_action_id" ref="action_dummy"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
         <field name="email_template_id" ref="email_template_8"/>
         </record>
diff --git a/addons/marketing_campaign_mailchimp/__openerp__.py b/addons/marketing_campaign_mailchimp/__openerp__.py
index 2a913eaa8da..ef3a0a82e65 100644
--- a/addons/marketing_campaign_mailchimp/__openerp__.py
+++ b/addons/marketing_campaign_mailchimp/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "",
     "version" : "1.1",
     "depends" : ['marketing_campaign'],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules/Marketing',
     "description": """
     """,
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
index b4a89a2ca43..3b971093ab7 100644
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
@@ -18,7 +18,7 @@
                 <group colspan="2" attrs="{'invisible':[('type','!=','mailchimp')]}">
                     <field name="mailchimp_account_id" attrs="{'required':[('type','=','mailchimp')]}" domain="[('state','=','approved')]" on_change="onchange_mailchimp(mailchimp_account_id)"/>
                     <field name="mailchimp_list" attrs="{'required':[('type','=','mailchimp')]}" on_change="onchange_mailchimp_list(mailchimp_account_id,mailchimp_list)"/>
-                </group>                
+                </group>
             </xpath>
         </field>
     </record>
@@ -38,7 +38,7 @@
         <field name="model">mailchimp.account</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="All Accounts">
+            <tree colors="blue:state in ('draft');black:state in ('approved');gray:state in ('cancelled')" string="All Accounts">
                 <field name="name"/>
                 <field name="username" />
                 <field name="data_center"/>
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index 1de648ff8e8..fa9052f884c 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -36,7 +36,7 @@ It supports different kind of members:
 It is integrated with sales and accounting to allow you to automatically
 invoice and send propositions for membership renewal.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base', 'product', 'account', 'process'],
     'init_xml': ['membership_data.xml'],
     'update_xml': [
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 498c901e7b2..0fda9f581dc 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -22,7 +22,7 @@
 from osv import fields, osv
 from tools import config
 import time
-
+from tools.translate import _
 import decimal_precision as dp
 
 
@@ -46,96 +46,6 @@ STATE_PRIOR = {
         'paid' : 7
         }
 
-#~ REQUETE = '''SELECT partner, state FROM (
-#~ SELECT members.partner AS partner,
-#~ CASE WHEN MAX(members.state) = 0 THEN 'none'
-#~ ELSE CASE WHEN MAX(members.state) = 1 THEN 'canceled'
-#~ ELSE CASE WHEN MAX(members.state) = 2 THEN 'old'
-#~ ELSE CASE WHEN MAX(members.state) = 3 THEN 'waiting'
-#~ ELSE CASE WHEN MAX(members.state) = 4 THEN 'invoiced'
-#~ ELSE CASE WHEN MAX(members.state) = 6 THEN 'free'
-#~ ELSE CASE WHEN MAX(members.state) = 7 THEN 'paid'
-#~ END END END END END END END END
-    #~ AS state FROM (
-#~ SELECT partner,
-    #~ CASE WHEN MAX(inv_digit.state) = 4 THEN 7
-    #~ ELSE CASE WHEN MAX(inv_digit.state) = 3 THEN 4
-    #~ ELSE CASE WHEN MAX(inv_digit.state) = 2 THEN 3
-    #~ ELSE CASE WHEN MAX(inv_digit.state) = 1 THEN 1
-#~ END END END END
-#~ AS state
-#~ FROM (
-    #~ SELECT p.id as partner,
-    #~ CASE WHEN ai.state = 'paid' THEN 4
-    #~ ELSE CASE WHEN ai.state = 'open' THEN 3
-    #~ ELSE CASE WHEN ai.state = 'proforma' THEN 2
-    #~ ELSE CASE WHEN ai.state = 'draft' THEN 2
-    #~ ELSE CASE WHEN ai.state = 'cancel' THEN 1
-#~ END END END END END
-#~ AS state
-#~ FROM res_partner p
-#~ JOIN account_invoice ai ON (
-    #~ p.id = ai.partner_id
-#~ )
-#~ JOIN account_invoice_line ail ON (
-    #~ ail.invoice_id = ai.id
-#~ )
-#~ JOIN membership_membership_line ml ON (
-    #~ ml.account_invoice_line  = ail.id
-#~ )
-#~ WHERE ml.date_from <= '%s'
-#~ AND ml.date_to >= '%s'
-#~ GROUP BY
-#~ p.id,
-#~ ai.state
-    #~ )
-    #~ AS inv_digit
-    #~ GROUP by partner
-#~ UNION
-#~ SELECT p.id AS partner,
-    #~ CASE WHEN  p.free_member THEN 6
-    #~ ELSE CASE WHEN p.associate_member IN (
-        #~ SELECT ai.partner_id FROM account_invoice ai JOIN
-        #~ account_invoice_line ail ON (ail.invoice_id = ai.id AND ai.state = 'paid')
-        #~ JOIN membership_membership_line ml ON (ml.account_invoice_line = ail.id)
-        #~ WHERE ml.date_from <= '%s'
-        #~ AND ml.date_to >= '%s'
-    #~ )
-    #~ THEN 5
-#~ END END
-#~ AS state
-#~ FROM res_partner p
-#~ WHERE p.free_member
-#~ OR p.associate_member > 0
-#~ UNION
-#~ SELECT p.id as partner,
-    #~ MAX(CASE WHEN ai.state = 'paid' THEN 2
-    #~ ELSE 0
-    #~ END)
-#~ AS state
-#~ FROM res_partner p
-#~ JOIN account_invoice ai ON (
-    #~ p.id = ai.partner_id
-#~ )
-#~ JOIN account_invoice_line ail ON (
-    #~ ail.invoice_id = ai.id
-#~ )
-#~ JOIN membership_membership_line ml ON (
-    #~ ml.account_invoice_line  = ail.id
-#~ )
-#~ WHERE ml.date_from < '%s'
-#~ AND ml.date_to < '%s'
-#~ AND ml.date_from <= ml.date_to
-#~ GROUP BY
-#~ p.id
-#~ )
-#~ AS members
-#~ GROUP BY members.partner
-#~ )
-#~ AS final
-#~ %s
-#~ '''
-
 class membership_line(osv.osv):
     '''Member line'''
 
@@ -215,12 +125,16 @@ class membership_line(osv.osv):
     _name = 'membership.membership_line'
     _columns = {
             'partner': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=1),
+            'membership_id': fields.many2one('product.product', string="Membership", required=True),
             'date_from': fields.date('From', readonly=True),
             'date_to': fields.date('To', readonly=True),
             'date_cancel' : fields.date('Cancel date'),
+            'date': fields.date('Join Date'),
+            'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
             'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
+            'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
             'state': fields.function(_state, method=True, string='State', type='selection', selection=STATE),
-            }
+    }
     _rec_name = 'partner'
     _order = 'id desc'
     _constraints = [
@@ -381,14 +295,13 @@ class Partner(osv.osv):
     _columns = {
         'associate_member': fields.many2one('res.partner', 'Associate member'),
         'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
-        'member': fields.boolean('Member'),
         'free_member': fields.boolean('Free member'),
         'membership_amount': fields.float(
                     'Membership amount', digits=(16, 2),
                     help='The price negociated by the partner'),
         'membership_state': fields.function(
                     __get_membership_state, method = True,
-                    string = 'Current membership state', type = 'selection',
+                    string = 'Current Membership State', type = 'selection',
                     selection = STATE ,store = {
                         'account.invoice':(_get_invoice_partner,['state'], 10),
                         'membership.membership_line':(_get_partner_id,['state'], 10),
@@ -453,6 +366,61 @@ class Partner(osv.osv):
         default = default.copy()
         default['member_lines'] = []
         return super(Partner, self).copy(cr, uid, id, default, context)
+    
+    def create_membership_invoice(self, cr, uid, ids, product_id=None, datas=None, context=None):
+        """ Create Customer Invoice of Membership for partners.
+        @param datas: datas has dictionary value which consist Id of Membership product and Cost Amount of Membership.
+                      datas = {'membership_product_id': None, 'amount':None}
+        """
+        invoice_obj = self.pool.get('account.invoice')
+        product_obj = self.pool.get('product.product')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        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]
+        for partner in self.browse(cr, uid, ids, context=context):
+            account_id = partner.property_account_receivable and partner.property_account_receivable.id or False
+            fpos_id = partner.property_account_position and partner.property_account_position.id or False
+            addr = self.address_get(cr, uid, [partner.id], ['invoice'])
+            if partner.free_member:
+                raise osv.except_osv(_('Error !'),
+                        _("Partner is a free Member."))
+            if not addr.get('invoice', False):
+                raise osv.except_osv(_('Error !'),
+                        _("Partner doesn't have an address to make the invoice."))
+            quantity = 1
+            line_value =  {
+                'product_id' : product_id,
+            }
+            
+            line_dict = invoice_line_obj.product_id_change(cr, uid, {}, 
+                            product_id, False, quantity, '', 'out_invoice', partner.id, fpos_id, price_unit=amount, context=context)
+            line_value.update(line_dict['value'])
+            if line_value.get('invoice_line_tax_id', False):
+                tax_tab = [(6, 0, line_value['invoice_line_tax_id'])]
+                line_value['invoice_line_tax_id'] = tax_tab
+
+            invoice_id = invoice_obj.create(cr, uid, {
+                'partner_id' : partner.id,
+                'address_invoice_id': addr.get('invoice', False),
+                'account_id': account_id,
+                'fiscal_position': fpos_id or False
+                }
+            )
+            line_value['invoice_id'] = invoice_id
+            invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context)
+            invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]}, context=context)
+            invoice_list.append(invoice_id)
+            if line_value['invoice_line_tax_id']:
+                tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
+                for tax in tax_value:
+                       invoice_tax_obj.create(cr, uid, tax, context=context)
+        return invoice_list
 
 Partner()
 
@@ -460,7 +428,7 @@ class product_template(osv.osv):
     _inherit = 'product.template'
     _columns = {
             'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price')),
-            }
+    }
 product_template()
 
 class Product(osv.osv):
@@ -484,8 +452,8 @@ class Product(osv.osv):
     _inherit = 'product.product'
     _columns = {
             'membership': fields.boolean('Membership', help='Specify if this product is a membership product'),
-            'membership_date_from': fields.date('Date from'),
-            'membership_date_to': fields.date('Date to'),
+            'membership_date_from': fields.date('Date from', help='Active Membership since this date'),
+            'membership_date_to': fields.date('Date to', help='Expired date of Membership'),
 #           'member_price':fields.float('Member Price'),
             }
 
@@ -535,6 +503,9 @@ class account_invoice_line(osv.osv):
                         date_from = line.invoice_id.date_invoice
                     line_id = member_line_obj.create(cr, uid, {
                         'partner': line.invoice_id.partner_id.id,
+                        'membership_id': line.product_id.id,
+                        'member_price': line.price_unit,
+                        'date': time.strftime('%Y-%m-%d'),
                         'date_from': date_from,
                         'date_to': date_to,
                         'account_invoice_line': line.id,
@@ -572,6 +543,9 @@ class account_invoice_line(osv.osv):
                     date_from = line.invoice_id.date_invoice
                 line_id = member_line_obj.create(cr, uid, {
                     'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
+                    'membership_id': line.product_id.id,
+                    'member_price': line.price_unit,
+                    'date': time.strftime('%Y-%m-%d'),
                     'date_from': date_from,
                     'date_to': date_to,
                     'account_invoice_line': line.id,
@@ -579,4 +553,4 @@ class account_invoice_line(osv.osv):
         return result
 
 account_invoice_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml
index d16c6db68aa..fa8dda9e5cb 100644
--- a/addons/membership/membership_demo.xml
+++ b/addons/membership/membership_demo.xml
@@ -2,170 +2,38 @@
 <openerp>
     <data>
 
-<!-- Demo Data for Membership Product -->
-    <record id="member_product_0" model="product.product">
+<!-- Demo Data for Memberships  -->
+    <record id="membership_0" model="product.product">
         <field name="membership">True</field>
-        <field name="membership_date_from">2009-01-01</field>
-        <field name="membership_date_to">2010-06-01</field>
-        <field name="name">Membership Product - 1</field>
-        <field name="list_price">80</field>
+        <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
+        <field eval="time.strftime('%Y-06-01')" name="membership_date_to"/>
+        <field name="name">Golden Membership</field>
+        <field name="list_price">180</field>
         <field name="categ_id" ref="product.cat1"/>
         <field name="type">service</field>
     </record>
-    <record id="member_product_1" model="product.product">
+    <record id="membership_1" model="product.product">
         <field name="membership">True</field>
-        <field name="membership_date_from">2009-01-01</field>
-        <field name="membership_date_to">2010-08-01</field>
-        <field name="name">Membership Product - 2</field>
+        <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
+        <field eval="time.strftime('%Y-08-01')" name="membership_date_to"/>
+        <field name="name">Silver Membership</field>
         <field name="categ_id" ref="product.cat1"/>
         <field name="list_price">80</field>
         <field name="type">service</field>
     </record>
-
-
-<!-- Demo data for Accounts -->
-    <record id="account_account_membershipparent" model="account.account">
-        <field name="name">membership</field>
-        <field name="code">Membership-0</field>
-        <field name="company_id" ref="base.main_company"/>
-        <!--<field eval="1" name="sign"/>-->
-        <field eval="1" name="active"/>
-        <field name="type">view</field>
-        <field eval="0" name="reconcile"/>
-        <field name="user_type" ref="account.account_type_root"/>
-    </record>
-    <record id="account_account_membershipaccount0" model="account.account">
-        <field name="name">membership account</field>
-        <field name="code">Membership-1254</field>
-        <field name="company_id" ref="base.main_company"/>
-        <!--<field eval="1" name="sign"/>-->
-        <field eval="1" name="active"/>
-        <field name="type">other</field>
-        <field eval="1" name="reconcile"/>
-        <field name="user_type" ref="account.account_type_expense"/>
-        <field name="parent_id" ref="account_account_membershipparent"/>
-    </record>
-
-<!-- Demo data for Invoices -->
-    <record id="account_invoice_0" model="account.invoice">
-        <field name="account_id" ref="account_account_membershipaccount0"/>
-        <field name="company_id" ref="base.main_company"/>
-        <field name="currency_id" ref="base.EUR"/>
-        <field name="address_invoice_id" ref="base.res_partner_address_8"/>
-        <field name="partner_id" ref="base.res_partner_agrolait"/>
-        <field name="date_invoice">2008-05-09</field>
-        <field name="journal_id" ref="account.sales_journal"/>
-        <field name="state">paid</field>
-        <field name="type">out_invoice</field>
-    </record>
-    <record id="account_invoice_1" model="account.invoice">
-        <field name="account_id" ref="account_account_membershipaccount0"/>
-        <field name="company_id" ref="base.main_company"/>
-        <field name="currency_id" ref="base.EUR"/>
-        <field name="address_invoice_id" ref="base.res_partner_address_9"/>
-        <field name="partner_id" ref="base.res_partner_2"/>
-        <field name="date_invoice">2008-05-09</field>
-        <field name="journal_id" ref="account.sales_journal"/>
-        <field name="state">open</field>
-        <field name="type">out_invoice</field>
-    </record>
-    <record id="account_invoice_2" model="account.invoice">
-        <field name="account_id" ref="account_account_membershipaccount0"/>
-        <field name="company_id" ref="base.main_company"/>
-        <field name="currency_id" ref="base.EUR"/>
-        <field name="address_invoice_id" ref="base.res_partner_address_zen"/>
-        <field name="partner_id" ref="base.res_partner_3"/>
-        <field name="date_invoice">2008-05-09</field>
-        <field name="journal_id" ref="account.sales_journal"/>
-        <field name="state">cancel</field>
-        <field name="type">out_invoice</field>
-    </record>
-    <record id="account_invoice_3" model="account.invoice">
-        <field name="account_id" ref="account_account_membershipaccount0"/>
-        <field name="company_id" ref="base.main_company"/>
-        <field name="currency_id" ref="base.EUR"/>
-        <field name="address_invoice_id" ref="base.res_partner_address_14"/>
-        <field name="partner_id" ref="base.res_partner_15"/>
-        <field name="date_invoice">2008-05-09</field>
-        <field name="journal_id" ref="account.sales_journal"/>
-        <field name="state">draft</field>
-        <field name="type">out_invoice</field>
-    </record>
-
-<!-- Demo data for invoice line -->
-    <record id="account_invoice_line_membershipproduct0" model="account.invoice.line">
-        <field name="name">Membership Product - 1</field>
-        <field name="invoice_id" ref="account_invoice_0"/>
-        <field eval="1.0" name="price_unit"/>
-        <field eval="1.0" name="quantity"/>
-        <field name="account_id" ref="account_account_membershipaccount0"/>
-        <field name="product_id" ref="membership.member_product_0"/>
-        <field name="account_analytic_id" ref="account.analytic_project_2"/>
-    </record>
-    <record id="account_invoice_line_membershipproduct1" model="account.invoice.line">
-        <field name="name">Membership Product - 2</field>
-        <field name="invoice_id" ref="account_invoice_1"/>
-        <field eval="1.0" name="price_unit"/>
-        <field eval="1.0" name="quantity"/>
-        <field name="account_id" ref="account_account_membershipaccount0"/>
-        <field name="product_id" ref="membership.member_product_1"/>
-        <field name="account_analytic_id" ref="account.analytic_project_2"/>
-    </record>
-    <record id="account_invoice_line_membershipproduct2" model="account.invoice.line">
-        <field name="name">Membership Product - 2</field>
-        <field name="invoice_id" ref="account_invoice_2"/>
-        <field eval="1.0" name="price_unit"/>
-        <field eval="1.0" name="quantity"/>
-        <field name="account_id" ref="account_account_membershipaccount0"/>
-        <field name="product_id" ref="membership.member_product_1"/>
-        <field name="account_analytic_id" ref="account.analytic_project_2"/>
-    </record>
-    <record id="account_invoice_line_membershipproduct3" model="account.invoice.line">
-        <field name="name">Membership Product - 2</field>
-        <field name="invoice_id" ref="account_invoice_3"/>
-        <field eval="1.0" name="price_unit"/>
-        <field eval="1.0" name="quantity"/>
-        <field name="account_id" ref="account_account_membershipaccount0"/>
-        <field name="product_id" ref="membership.member_product_1"/>
-        <field name="account_analytic_id" ref="account.analytic_project_2"/>
-    </record>
-
-<!-- Demo data for membership line -->
-    <record id="member_line_1" model="membership.membership_line">
-        <field name="date_from">2008-01-01</field>
-        <field name="date_to">2009-08-01</field>
-        <field name="account_invoice_line" ref="account_invoice_line_membershipproduct0" />
-        <field name="state">paid</field>
-        <field name="partner" ref="base.res_partner_agrolait"/>
-    </record>
-    <record id="member_line_2" model="membership.membership_line">
-        <field name="date_from">2008-01-01</field>
-        <field name="date_to">2009-08-01</field>
-        <field name="account_invoice_line" ref="account_invoice_line_membershipproduct1" />
-        <field name="state">invoiced</field>
-        <field name="partner" ref="base.res_partner_2"/>
-    </record>
-    <record id="member_line_3" model="membership.membership_line">
-        <field name="date_from">2008-01-01</field>
-        <field name="date_to">2009-08-01</field>
-        <field name="date_cancel">2008-08-05</field>
-        <field name="account_invoice_line" ref="account_invoice_line_membershipproduct2" />
-        <field name="state">canceled</field>
-        <field name="partner" ref="base.res_partner_3"/>
-    </record>
-    <record id="member_line_3" model="membership.membership_line">
-        <field name="date_from">2008-01-01</field>
-        <field name="date_to">2009-08-01</field>
-        <field name="account_invoice_line" ref="account_invoice_line_membershipproduct3" />
-        <field name="state">waiting</field>
-        <field name="partner" ref="base.res_partner_15"/>
-    </record>
-
-<!-- Demo data for cancel member -->
-    <record id="base.res_partner_3" model="res.partner">
-        <field name="membership_cancel">2009-01-01</field>
+    <record id="membership_2" model="product.product">
+        <field name="membership">True</field>
+        <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
+        <field eval="time.strftime('%Y-08-01')" name="membership_date_to"/>
+        <field name="name">Basic Membership</field>
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="list_price">40</field>
+        <field name="type">service</field>
     </record>
 
+<!-- Join Memberships  -->
+    <function model="res.partner" name="create_membership_invoice" eval="(ref('base.res_partner_agrolait'), ref('membership_0'), {'amount':180})"/>
+    
 <!-- Demo data for free member -->
     <record id="base.res_partner_desertic_hispafuentes" model="res.partner">
         <field name="free_member">True</field>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index ddbc81629cf..1e5535802c2 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -18,29 +18,26 @@
                     <field name="name"/>
                     <field name="membership_date_from"/>
                     <field name="membership_date_to"/>
-                    <field name="lst_price"/>
+                    <field name="list_price" string="Membership Fee"/>
                 </tree>
             </field>
         </record>
 
         <record model="ir.ui.view" id="membership_products_form">
-            <field name="name">Membership products</field>
+            <field name="name">Memberships</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Membership products">
-                    <field name="default_code"/>
+                <form string="Membership products">                    
                     <field name="name"/>
-                    <field name="membership_date_from" required="1"/>
-                    <field name="membership_date_to" required="1"/>
-                    <field name="list_price"/>
+                    <field name="default_code"/>
                     <field name="type"/>
                     <field name="categ_id"/>
-                    <field name="membership" colspan="1"/>
-                    <field name="active" colspan="1"/>
-                    <newline/>
+                    <field name="membership_date_from" required="1"/>
+                    <field name="membership_date_to" required="1"/>
+                    <field name="list_price" string="Membership Fee"/>                    
                     <separator colspan="4" string="Customer Taxes:"/>
-                    <field name="taxes_id" colspan="4" nolabel="1"/> 
+                    <field name="taxes_id" colspan="4" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -62,7 +59,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_membership_products">
-            <field name="name">Membership Products</field>
+            <field name="name">Memberships</field>
             <field name="res_model">product.product</field>
             <field name="domain">[('membership','=',True), ('type', '=', 'service')]</field>
             <field name="context">{'membership':True, 'type':'service'}</field>
@@ -82,16 +79,14 @@
             <field name="act_window_id" ref="action_membership_products"/>
         </record>
 
-        <menuitem name="Membership" id="menu_membership" icon="terp-crm" sequence="25"/>
-        <menuitem name="Members" parent="menu_membership"
-            id="menu_member"
-            sequence="1"/>
-        <menuitem name="Configuration" parent="menu_membership"
-            id="menu_conf"
-            sequence="3"/>
-        <menuitem name="Membership products" parent="menu_conf"
+        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
+        <menuitem name="Membership" id="menu_membership" sequence="0" parent="base.menu_association"/>
+        <menuitem name="Memberships" parent="menu_membership"
             id="menu_membership_products"
-            action="action_membership_products"/>
+            action="action_membership_products" sequence="1"/>
+        
+        
+        
 
 
 
@@ -129,7 +124,7 @@
                </field>
             </field>
         </record>
-        
+
         <record id="view_res_partner_member_filter2" model="ir.ui.view">
             <field name="name">res.partner.select2</field>
             <field name="model">res.partner</field>
@@ -152,7 +147,6 @@
         <record model="ir.actions.act_window" id="action_membership_members">
             <field name="name">Members</field>
             <field name="res_model">res.partner</field>
-            <field name="domain">[('membership_state','&lt;&gt;','none'),('membership_state','&lt;&gt;','canceled'),('membership_state','&lt;&gt;','old'),('membership_state','&lt;&gt;','waiting')]</field>
             <field name="search_view_id" ref="view_res_partner_member_filter"/>
             <field name="context">{"search_default_old": 1}</field>
         </record>
@@ -169,8 +163,8 @@
             <field name="view_mode">form</field>
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
-        
-        <menuitem name="Members" parent="menu_member" id="menu_members" sequence="2" action="action_membership_members"/>
+
+        <menuitem name="Members" parent="menu_membership" id="menu_members" sequence="2" action="action_membership_members"/>
 
         <!-- PARTNERS -->
 <!--
@@ -182,17 +176,7 @@
             />
  -->
 
-        <record id="view_res_partner_member_form2" model="ir.ui.view">
-            <field name="name">res.partner.form2</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <field name="supplier" position="after">
-                        <field name="member"/>
-               </field>
-            </field>
-        </record>
+
 
         <record model="ir.ui.view" id="view_partner_tree">
             <field name="name">res.partner.tree.form.inherit</field>
@@ -213,37 +197,44 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Membership">
-                        <field name="membership_state"/>
-                        <field name="membership_amount"/>
-                        <field name="associate_member"/>
-                        <field name="free_member"/>
-                        <field name="membership_start"/>
-                        <field name="membership_stop"/>
-                        <field name="membership_cancel"/>
-                        <field name="member_lines" nolabel="1" colspan="4">
-                            <tree string="Membership">
-                                <field name="date_from"/>
-                                <field name="date_to"/>
+                        <group colspan="2" col="2">
+                            <group colspan="4" col="3">
+                            <field name="free_member"/>
+                            <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" icon="gtk-apply"/>
+                            <field colspan="4" name="associate_member" attrs="{'invisible':[('membership_state', '!=', 'none')], 'readonly':[('free_member','=',True)]}"/>
+                            <field colspan="4" name="membership_state"/>
+                            </group>               
+                        </group>
+                        <group colspan="2" col="2">
+                            <field name="membership_start"/>
+                            <field name="membership_stop"/>
+                            <field name="membership_cancel"/>
+                        </group>                        
+                        <field name="member_lines" nolabel="1" colspan="4" readonly="1">
+                            <tree string="Memberships">
+                                <field name="date"/>
+                                <field name="membership_id"/>
+                                <field name="member_price"/>
+                                <field name="account_invoice_id"/>
                                 <field name="state"/>
                             </tree>
-                            <form string="Membership">
-                                <field name="date_from"/>
-                                <field name="date_to"/>
-                                <field name="account_invoice_line"/>
-                                <field name="state"/>
+                            <form string="Memberships">
+                                <field name="date"/>                                
+                                <field name="member_price"/>
+                                <field name="membership_id"/>
+                                <field name="account_invoice_id"/>
+                                <field name="state" colspan="4"/>
                             </form>
-                        </field>
+                        </field>                       
+                        
                     </page>
                 </notebook>
             </field>
         </record>
 
         <!-- MEMBERSHIP/REPORTING -->
-        <menuitem name="Reporting" parent="menu_membership"
-            sequence="2"
-            id="menu_reporting"/>
-
-
+        <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
+        
 <!-- View for product.product object inherited from product module................ -->
         <record model="ir.ui.view" id="view_product_form_inherit1">
             <field name="name">product.normal.form</field>
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index cd0142f5604..fc14b65f698 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -55,13 +55,15 @@ class report_membership(osv.osv):
                                     ('done', 'Old Member'),
                                    ('open', 'Invoiced Member'),
                                     ('free', 'Free Member'), ('paid', 'Paid Member')], 'State'),
-        'partner_id': fields.many2one('res.partner', 'Members', readonly=True, select=3) 
+        'partner_id': fields.many2one('res.partner', 'Members', readonly=True, select=3),
+        'membership_id': fields.many2one('product.product', 'Membership', readonly=True, select=3) 
                 
 
 }
 
     def init(self, cr):
         '''Create the view'''
+        tools.drop_view_if_exists(cr, 'report_membership')
         cr.execute("""
     CREATE OR REPLACE VIEW report_membership AS (
         SELECT
@@ -78,6 +80,7 @@ class report_membership(osv.osv):
         month,
         create_date,
         partner_id,
+        membership_id,
         state,
         currency
         
@@ -105,7 +108,8 @@ class report_membership(osv.osv):
             ai.partner_id AS partner_id,
             ai.currency_id AS currency,
             ai.state as state,
-            MIN(ml.id) AS id
+            MIN(ml.id) AS id,
+            ml.membership_id AS membership_id
             FROM membership_membership_line ml
             JOIN (account_invoice_line ail
                 LEFT JOIN account_invoice ai
@@ -114,10 +118,10 @@ class report_membership(osv.osv):
             JOIN res_partner p
             ON (ml.partner = p.id)
             GROUP BY TO_CHAR(ml.date_from, 'YYYY'),  TO_CHAR(ml.date_from, 'MM'), TO_CHAR(ml.date_from, 'YYYY-MM-DD'), ai.state, ai.partner_id,
-            ai.currency_id, ml.id) AS foo
-        GROUP BY year, month, create_date, currency, partner_id, state)
+            ai.currency_id, ml.id, ml.membership_id) AS foo
+        GROUP BY year, month, create_date, currency, partner_id, membership_id, state)
                 """)
         
 report_membership()
 
-#
\ No newline at end of file
+#
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 76c0dff4404..bdb5065b766 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -9,9 +9,10 @@
             <field name="model">report.membership</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Membership">
+                <tree colors="blue:state in ('draft');black:state in ('open','free');gray:state in ('done','cancel') " string="Membership">
                     <field name="state"/>
                     <field name="partner_id"/>
+                    <field name="membership_id"/>
                     <field name="canceled_number"/>
                     <field name="waiting_number"/>
                     <field name="invoiced_number"/>
@@ -47,12 +48,14 @@
     
                         <separator orientation="vertical"/>
                         <field name="partner_id"/>
+                        <field name="membership_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="12">
                         <filter string="Members" icon="terp-personal" name="member"
                             domain="[]" context="{'group_by':'partner_id'}"/>
-                            
+                        <filter string="Memberships" icon="terp-personal" name="membership"
+                            domain="[]" context="{'group_by':'membership_id'}"/>    
                        <filter string="state" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}"/>
                                       
@@ -104,9 +107,9 @@
             <field name="act_window_id" ref="action_report_membership_tree"/>
         </record>
 
-        <menuitem name="Membership" parent="menu_reporting"
+        <menuitem name="Membership" parent="base.menu_report_association"
             action="action_report_membership_tree"
             id="menu_report_membership"/>
 
     </data>
-</openerp>            
\ No newline at end of file
+</openerp>            
diff --git a/addons/membership/test/test_membership.yml b/addons/membership/test/test_membership.yml
index bbeceed3d89..16ac0674ee8 100644
--- a/addons/membership/test/test_membership.yml
+++ b/addons/membership/test/test_membership.yml
@@ -1,101 +1,167 @@
 - |  
   In Order to test the Membership in OpenERP, which allows us to manage all operations for managing memberships.
 - |
-  We have to create "Membership Products" to make it available for partner or customer to make membership with it.
-  select product type   to "service" type and membership field is ticked to visible this product while creating membership for the partner.
+  I'm creating "Golden Membership" which has Membership fee 80 EURO and It's started from 1st June to 31st Dec.
 - 
   !record {model: product.product, id: product_product_membershipproduct0}:
     categ_id: product.cat1
     membership: 1
-    membership_date_from: '2009-06-01'
-    membership_date_to: '2010-06-01'
-    name: Membership Products
+    membership_date_from: '2010-06-01'
+    membership_date_to: '2010-12-31'
+    name: Golden Membership
     type: service
     list_price: 80.00
     
 - |
-  I create new member "Mark Johnson" and I provide an address to this
-  new customer, as well as an email "info@mycustomer.com".
+  "Mark Johnson" want to join "Golden Membership".
+- |
+  I'm creating new member "Mark Johnson".
 - 
   !record {model: res.partner, id: res_partner_markjohnson0}:
     address:
       - city: paris
         country_id: base.fr
-        name: Arthur Grosbonnet
+        name: Mark Johnson
         street: 1 rue Rockfeller
-        type: default
+        type: invoice
         zip: '75016'
-    credit_limit: 0.0
-    membership_amount: 0.0
     name: Mark Johnson
-    property_account_payable: account.a_pay
-    property_account_receivable: account.a_recv
-
 - |
-  I check that "Current membership state" is set to "Non Member". 
+  I'm checking  "Current Membership State" of "Mark Johnson". It is an "Non Member" or not. 
 - 
   !assert {model: res.partner, id: res_partner_markjohnson0}:
-      - membership_state == 'none'
-- |  
-  I can make it a Free member by selecting the "Free member" check box.
-- 
-  !record {model: res.partner, id: membership.res_partner_markjohnson0}:
-    free_member: 1
+      - membership_state == 'none', 'Member should be has "Current Membership State" in "Non Member".'
 - |
-  Now, I create Membership Invoices using wizard available on partner and  Select Membership Product.
+  I'm doing to make membership invoice for "Mark Johnson" on joining "Golden Membership".
 - 
-  !record {model: membership.invoice, id: membership_invoice_0}:
-    product_id: membership.product_product_membershipproduct0
-    
+  !python {model: res.partner}: |
+    self.create_membership_invoice(cr, uid, [ref("res_partner_markjohnson0")], product_id=ref("product_product_membershipproduct0"), datas={"amount":80.00})
 - |
-  I click on "Confirm" button of this wizard. and also check that address is defined or not for this partner in this function.  
+  I'm checking  "Current Membership State" of "Mark Johnson". It is an "Waiting Member" or not. 
 - 
-  !python {model: membership.invoice}: |
-    self.membership_invoice(cr, uid, [ref("membership_invoice_0")], {"active_ids": [ref("membership.res_partner_markjohnson0")]})
-
+  !assert {model: res.partner, id: res_partner_markjohnson0}:
+      - membership_state == 'waiting', 'Member should be has "Current Membership State" in "Waiting Member".'
 - |
-  I check that Invoice is created for this members.
+  I'm Opening that Invoice which is created for "Mark Johnson".
 -
   !python {model: res.partner}: |
-  
+        import netsvc  
         from tools.translate import _
-        invoice_obj = self.pool.get('account.invoice')
-        partner_obj = self.pool.get('res.partner')
-        product_obj = self.pool.get('product.product')
-        invoice_line_obj = self.pool.get('account.invoice.line')
+        invoice_pool = self.pool.get('account.invoice')
+        partner_pool = self.pool.get('res.partner')
+        membership_line_pool = self.pool.get('membership.membership_line')
+        membership_pool = self.pool.get('product.product')
         
-        partner_id = self.browse(cr, uid, ref('res_partner_markjohnson0'))
-        inv_ids = invoice_obj.search(cr, uid, [('partner_id', '=', partner_id.id), ('account_id', '=', partner_id.property_account_receivable.id)])
-        invoice_id = invoice_obj.browse(cr, uid, inv_ids)[0]
-        product = product_obj.browse(cr, uid, ref('product_product_membershipproduct0'), context=context)        
-        line_ids = invoice_line_obj.search(cr, uid, [('product_id', '=', product.id), ('invoice_id', '=', invoice_id.id)])
-        
-        assert line_ids, _('Invoices has not been generated for this Member!')
-         
+        membership_line_ids = membership_line_pool.search(cr, uid, [('membership_id','=',ref('product_product_membershipproduct0')),('partner','=',ref('res_partner_markjohnson0'))])
+        membership_lines = membership_line_pool.browse(cr, uid, membership_line_ids)
+        assert membership_lines, _('Membership is not registrated.')
+        membership_line = membership_lines[0]
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'account.invoice', membership_line.account_invoice_id.id, 'invoice_open', cr)
 - |
-  I check that the "Current membership state" will remain same untill opening the invoice.
+  I'm checking "Current membership state" of "Mark Johnson". It is an "Invoiced Member" or not.
 -
   !assert {model: res.partner, id: res_partner_markjohnson0}:
-     - membership_state == 'free'  
+     - membership_state == 'invoiced', 'Member should be has "Current Membership State" in "Invoiced Member".'
   
 - |
-  "Current membership state" of any member depends on the state of invoice.
-  So, I check that  invoice is in draft state then the "membership state" of a member is "Waiting member".
+  I'm doing to paid that invoice which is opened for "Mark Johnson".
 -
-  !python {model: membership.membership_line}: |
-        partner_obj = self.pool.get('res.partner')    
-        inv_obj = self.pool.get('account.invoice')
+  !python {model: account.invoice}: |
+  
+        from tools.translate import _
+        invoice_pool = self.pool.get('account.invoice')
+        partner_pool = self.pool.get('res.partner')
+        membership_line_pool = self.pool.get('membership.membership_line')
+        membership_pool = self.pool.get('product.product')
+        invoice_pay_pool = self.pool.get('account.invoice.pay')
         
-        partner_id = partner_obj.browse(cr, uid, ref('res_partner_markjohnson0'))
-        member_ids = self.search(cr, uid, [('partner', '=', partner_id.id)])
-        current_id = self.browse(cr, uid, member_ids)[0]
-        
-        inv_ids = inv_obj.search(cr, uid, [('partner_id', '=', partner_id.id), ('account_id', '=', partner_id.property_account_receivable.id)])
-        inv_id = inv_obj.browse(cr, uid, inv_ids)[0]
-        if inv_id.state == 'draft':
-            assert current_id.state == 'waiting'
+        membership_line_ids = membership_line_pool.search(cr, uid, [('membership_id','=',ref('product_product_membershipproduct0')),('partner','=',ref('res_partner_markjohnson0'))])
+        membership_lines = membership_line_pool.browse(cr, uid, membership_line_ids)
+        assert membership_lines, _('Membership is not registrated.')
+        membership_line = membership_lines[0]
+        assert membership_line.account_invoice_id.state == 'open', _('Invoice should be Opened.')
+        pay_id = invoice_pay_pool.create(cr, uid, {'amount': 80, 'name': 'Payment of Membership', 'journal_id': ref('account.bank_journal')}, {'active_id': membership_line.account_invoice_id.id})
+        invoice_pay_pool.pay_and_reconcile(cr, uid, [pay_id], {'active_id': membership_line.account_invoice_id.id}) 
 - |
-  When the invoice is in open state it become Invoiced Member, When the invoice is in paid state the same "Current membership state" changed to Paid Member. 
-  Now, If we cancel the invoice "Current membership state" changed to Cancel Member.           
-            
-            
\ No newline at end of file
+  I'm checking "Current membership state" of "Mark Johnson". It is an "Paid Member" or not.
+-
+  !assert {model: res.partner, id: res_partner_markjohnson0}:
+     - membership_state == 'paid', 'Member should be has "Current Membership State" in "Paid Member".'
+
+- |
+  I'm creating free member "Ms. Johnson" of "Golden Membership".
+-
+  !record {model: res.partner, id: res_partner_msjohnson0}:
+    address:
+      - city: paris
+        country_id: base.fr
+        name: Ms. Johnson
+        street: 1 rue Rockfeller
+        type: invoice
+        zip: '75016'
+    name: Ms. Johnson
+    free_member: True
+
+- |
+  I'm checking "Current membership state" of "Ms. Johnson". It is an "Free Member" or not.
+- 
+  !assert {model: res.partner, id: res_partner_msjohnson0}:
+     - membership_state == 'free', 'Member should be has "Current Membership State" in "Free Member".'
+
+- |
+  I'm set "Mark Johnson" as a associated member of "Ms. Johnson" and also set Non free member.
+- 
+  !python {model: res.partner}: |
+    self.write(cr, uid, [ref("res_partner_msjohnson0")], {'free_member': False, 'associate_member': ref("res_partner_markjohnson0")})
+
+- |
+  I'm checking "Current membership state" of "Ms. Johnson". It is an "Paid Member" or not.
+- 
+  !assert {model: res.partner, id: res_partner_msjohnson0}:
+     - membership_state == 'paid', 'Member should be has "Current Membership State" in "Paid Member".'
+
+- |
+  I'm creating new "Silver Membership" which has Membership fee 50 EURO and It's started from 1st June to 31st Dec.
+-
+  !record {model: product.product, id: product_product_membershipproduct1}:
+    categ_id: product.cat1
+    membership: 1
+    membership_date_from: '2010-06-01'
+    membership_date_to: '2010-12-31'
+    name: Silver Membership
+    type: service
+    list_price: 50.00
+- |
+  I'm making invoice of "Mark Johnson" member on joining new membership "Silver Membership".
+-
+  !python {model: res.partner}: |
+    self.create_membership_invoice(cr, uid, [ref("res_partner_markjohnson0")], product_id=ref("product_product_membershipproduct1"), datas={"amount":50.00})
+- |
+  I'm checking "Current membership state" of "Mark Johnson". It is an "Old Member" or not.
+-
+  !assert {model: res.partner, id: res_partner_markjohnson0}:
+      - membership_state == 'old', 'Member should be has "Current Membership State" in "Old Member".'
+- |
+  I'm doing to make credit note of invoice which is paid by "Mark Johnson" to cancel membership.
+-
+  !python {model: account.invoice}: |
+        from tools.translate import _
+        invoice_pool = self.pool.get('account.invoice')
+        partner_pool = self.pool.get('res.partner')
+        membership_line_pool = self.pool.get('membership.membership_line')
+        membership_pool = self.pool.get('product.product')
+        invoice_refund_pool = self.pool.get('account.invoice.refund')
+        
+        membership_line_ids = membership_line_pool.search(cr, uid, [('membership_id','=',ref('product_product_membershipproduct0')),('partner','=',ref('res_partner_markjohnson0'))])
+        membership_lines = membership_line_pool.browse(cr, uid, membership_line_ids)
+        assert membership_lines, _('Membership is not registrated.')
+        membership_line = membership_lines[0]
+        refund_id = invoice_refund_pool.create(cr, uid, {'description': 'Refund of Membership'}, {'active_id': membership_line.account_invoice_id.id})
+        invoice_refund_pool.invoice_refund(cr, uid, [refund_id], {'active_id': membership_line.account_invoice_id.id, 'active_ids': [membership_line.account_invoice_id.id]}) 
+- |
+  I'm checking "Current membership state" of "Mark Johnson". It is an "Cancelled Member" or not.
+-
+  !assert {model: res.partner, id: res_partner_markjohnson0}:
+      - membership_state == 'canceled', 'Member should be has "Current Membership State" in "Cancelled Member".'
+  
diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
index a969abf0632..7536bd4b942 100644
--- a/addons/membership/wizard/membership_invoice.py
+++ b/addons/membership/wizard/membership_invoice.py
@@ -23,6 +23,7 @@ import time
 from osv import fields, osv
 from tools.translate import _
 import tools
+import decimal_precision as dp
 
 class membership_invoice(osv.osv_memory):
     """Membership Invoice"""
@@ -30,56 +31,32 @@ class membership_invoice(osv.osv_memory):
     _name = "membership.invoice"
     _description = "Membership Invoice"
     _columns = {
-        'product_id': fields.many2one('product.product','Membership Product', required=True),
+        'product_id': fields.many2one('product.product','Membership', required=True),
+        'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
     }
+    def onchange_product(self, cr, uid, ids, product_id):
+        """This function returns value of  product's member price based on product id.
+        """
+        if not product_id:
+            return {'value': {'unit_price': False}}
+        else:
+           unit_price=self.pool.get('product.product').price_get(cr, uid, [product_id])[product_id]
+           return {'value': {'member_price': unit_price}}
 
     def membership_invoice(self, cr, uid, ids, context=None):
-        invoice_obj = self.pool.get('account.invoice')
         partner_obj = self.pool.get('res.partner')
-        product_obj = self.pool.get('product.product')
-        invoice_line_obj = self.pool.get('account.invoice.line')
-        invoice_tax_obj = self.pool.get('account.invoice.tax')
+        datas = {}
         if not context:
-            context={}
-        partner_ids = context.get('active_ids', [])
-        invoice_list = []
-        for partner in partner_obj.browse(cr, uid, partner_ids, context=context):
-            account_id = partner.property_account_receivable and partner.property_account_receivable.id or False
-            fpos_id = partner.property_account_position and partner.property_account_position.id or False
-            addr = partner_obj.address_get(cr, uid, [partner.id], ['invoice'])
-            if not addr.get('invoice', False):
-                continue
-            for data in self.browse(cr, uid, ids, context=context):
-                product_id = data.product_id and data.product_id.id or False
-                product_uom_id = data.product_id and data.product_id.uom_id.id
-                quantity = 1
-                line_value =  {
-                    'product_id' : product_id,
-                }
-                
-                line_dict = invoice_line_obj.product_id_change(cr, uid, {}, 
-                                product_id, product_uom_id, quantity, '', 'out_invoice', partner.id, fpos_id, context=context)
-                line_value.update(line_dict['value'])
-                if line_value.get('invoice_line_tax_id', False):
-                    tax_tab = [(6, 0, line_value['invoice_line_tax_id'])]
-                    line_value['invoice_line_tax_id'] = tax_tab
-
-                invoice_id = invoice_obj.create(cr, uid, {
-                    'partner_id' : partner.id,
-                    'address_invoice_id': addr.get('invoice', False),
-                    'account_id': account_id,
-                    'fiscal_position': fpos_id or False
-                    }
-                )
-                line_value['invoice_id'] = invoice_id
-                invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context)
-                invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]}, context=context)
-                invoice_list.append(invoice_id)
-                if line_value['invoice_line_tax_id']:
-                    tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
-                    for tax in tax_value:
-                           invoice_tax_obj.create(cr, uid, tax, context=context)  
-           
+            context = {}
+        data = self.browse(cr, uid, ids)
+        if data:
+            data = data[0]
+            datas = {
+                'membership_product_id': data.product_id.id,
+                'amount': data.member_price
+            }
+        invoice_ids = context.get('active_ids', [])
+        invoice_list = partner_obj.create_membership_invoice(cr, uid, invoice_ids, datas=datas, context=context)
 
         return  {
             'domain': [('id', 'in', invoice_list)],
@@ -88,7 +65,7 @@ class membership_invoice(osv.osv_memory):
             'view_mode': 'tree,form',
             'res_model': 'account.invoice',
             'type': 'ir.actions.act_window',
-            }
+        }
 
 membership_invoice()
 
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index a869fa59f2c..717f66ec6a3 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -9,34 +9,23 @@
             <field name="arch" type="xml">
                 <form string="Membership Invoice">
                 	<group colspan="4" >
-                     	<field name="product_id" context="{'product':membership_product}" domain="[('membership','=',True)]" widget="selection"/>
+                     	<field name="product_id" colspan="4" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
+                        <field name="member_price" colspan="4" readonly="1"/>
                     </group>
                     <group colspan="4" col="6">
                         <button  icon="gtk-close" special="cancel" string="Close"/>
-           	            <button  icon="gtk-apply" string="Confirm" name="membership_invoice" type="object"/>
+           	            <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object"/>
                     </group>
                 </form>
             </field>
   	  </record>
-
        <record id="action_membership_invoice_view" model="ir.actions.act_window">
-           <field name="name">Membership Invoice</field>
+           <field name="name">Join Membership</field>
            <field name="res_model">membership.invoice</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
           <field name="view_id" ref="view_membership_invoice_view"/>
           <field name="target">new</field>
-       </record>
-
-		<record id="action_idea_post_vote_values" model="ir.values">
-	            <field name="model_id" ref="base.model_res_partner" />
-	            <field name="object" eval="1" />
-	            <field name="name">vote</field>
-	            <field name="key2">client_action_multi</field>
-	            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_membership_invoice_view'))"/>
-	            <field name="key">action</field>
-	            <field name="model">res.partner</field>
-	    </record>
-
+       </record>		
     </data>
 </openerp>
diff --git a/addons/membership/wizard/membership_unpaid_invoice.py b/addons/membership/wizard/membership_unpaid_invoice.py
index f403e78c81d..0dbbbb3c952 100644
--- a/addons/membership/wizard/membership_unpaid_invoice.py
+++ b/addons/membership/wizard/membership_unpaid_invoice.py
@@ -26,8 +26,8 @@ class member_unpaid_invoice(osv.osv_memory):
     _name = "membership.unpaid.invoice"
     _description = "List of Unpaid Partner"
     _columns ={
-        'product': fields.many2one('product.product','Membership product', size=64,required=True, help='Select Membership product'),
-               }
+        'product': fields.many2one('product.product','Membership', size=64,required=True, help='Select Membership.'),
+    }
 
     def invoice_membership(self, cr, uid, ids, context):
         model_obj = self.pool.get('ir.model.data')
@@ -45,7 +45,7 @@ class member_unpaid_invoice(osv.osv_memory):
 
         return {
             'domain': [('id', 'in', partners)],
-            'name': 'Unpaid Partners',
+            'name': 'Unpaid Members',
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'res.partner',
diff --git a/addons/membership/wizard/membership_unpaid_invoice_view.xml b/addons/membership/wizard/membership_unpaid_invoice_view.xml
index 6b57c49572b..9c5db96d5e3 100644
--- a/addons/membership/wizard/membership_unpaid_invoice_view.xml
+++ b/addons/membership/wizard/membership_unpaid_invoice_view.xml
@@ -7,20 +7,20 @@
             <field name="model">membership.unpaid.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="List Unpaid Partners">
+                <form string="List Unpaid Members">
                 	<group colspan="4" >
-                           <field name="product" context="{'product':membership_product}" domain="[('membership','=',True)]"/>
+                           <field name="product" domain="[('membership','=',True)]" widget="selection"/>
                     </group>
                     <group colspan="4" col="6">
                     	<button  icon="gtk-close" special="cancel" string="Close"/>
-           				<button  icon="gtk-ok" string="Unpaid Partners" name="invoice_membership" type="object"/>
+           				<button  icon="gtk-ok" string="Unpaid" name="invoice_membership" type="object"/>
                    </group>
                </form>
             </field>
   	  </record>
 
        <record id="action_unpaid_invoice_view" model="ir.actions.act_window">
-           <field name="name">List Unpaid Partners</field>
+           <field name="name">List Unpaid Members</field>
            <field name="res_model">membership.unpaid.invoice</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
@@ -28,9 +28,9 @@
           <field name="target">new</field>
        </record>
 
-        <menuitem name="List Unpaid Partners" id="menu_unpaid_invoice"
+        <menuitem name="List Unpaid Members" id="menu_unpaid_invoice"
 			action="action_unpaid_invoice_view"
-			parent="menu_member" />
+			parent="menu_membership" />
 
      </data>
 </openerp>
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 5fc5456ee9a..b5c72d41f68 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name" : "Manufacturing Resource Planning",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Production",
     "depends" : ["procurement", "stock", "resource", "purchase", "product","process"],
@@ -72,7 +72,6 @@
         'wizard/mrp_change_standard_price_view.xml',
 #        'wizard/mrp_track_prod_view.xml',
         'mrp_view.xml',
-        'mrp_wizard.xml',
         'mrp_report.xml',
         'company_view.xml',
         'process/stockable_product_process.xml',
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 4f62030999c..2c0182bb704 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -35,7 +35,7 @@
             <field name="view_id" ref="board_mrp_manager_form"/>
         </record>
 
-        <menuitem icon="terp-graph" id="menus_dash_mrp" name="Dashboard"
+        <menuitem id="menus_dash_mrp" name="Dashboard"
             parent="next_id_77" sequence="0"/>
         <menuitem
             action="open_board_manufacturing"
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index 440032f566a..0b9ea745ccd 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -1,30 +1,31 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* mrp
-#
+# * mrp
+# Giedrius Slavinskas <giedrius.slavinskas@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:36+0000\n"
-"Last-Translator: Andrius Vilciauskas <a.vilciauskas@gmail.com>\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-06-22 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: lt\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
 msgid "Moves Created"
-msgstr ""
+msgstr "Sukurta perdavimų"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "No. Of Cycles"
-msgstr ""
+msgstr "Ciklų skaičius"
 
 #. module: mrp
 #: help:mrp.procurement.compute.all,init,automatic:0
@@ -33,6 +34,7 @@ msgid ""
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
 msgstr ""
+"Paleidžiamas automatiškai, kai virtualios atsargos pasidaro mažiau nulio."
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
@@ -47,76 +49,78 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
 msgid "Revision"
-msgstr ""
+msgstr "Revizija"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
 #: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
 msgid "Compute Stock Minimum Rules Only"
-msgstr ""
+msgstr "Apskaičiuoti atsargų likučio taisykles"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
 msgid "Exceptions Procurements"
-msgstr ""
+msgstr "Išimtiniai planavimai"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Workcenters"
-msgstr ""
+msgstr "TK darbo centrai"
 
 #. module: mrp
 #: help:mrp.property,composition:0
 msgid "Not used in computations, for information purpose only."
-msgstr ""
+msgstr "Nenaudojama skaičiavimuose, tik informacijai."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
 msgid "Routings"
-msgstr ""
+msgstr "Technologinės kortelės"
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
 msgid "Packing list"
-msgstr ""
+msgstr "Važtaraštis"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
 msgid "Stockable Stock"
-msgstr ""
+msgstr "Sandėliuojami produktai."
 
 #. module: mrp
-#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0
+#: field:mrp.production,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Užsakymo numeris"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
 msgid "Configuration"
 msgstr "Nustatymai"
 
 #. module: mrp
 #: field:mrp.production,name:0
 msgid "Reference"
-msgstr ""
+msgstr "Nuoroda"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Finished Products"
-msgstr ""
+msgstr "Pabaigti produktai"
 
 #. module: mrp
 #: wizard_field:mrp.procurement.compute.all,init,automatic:0
 #: wizard_field:mrp.procurement.orderpoint.compute,init,automatic:0
 msgid "Automatic orderpoint"
-msgstr ""
+msgstr "Automatinio užsakymo taisyklės"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "Set / Pack"
-msgstr ""
+msgstr "Nustatyti / Pakuoti"
 
 #. module: mrp
 #: constraint:ir.ui.view:0
@@ -127,22 +131,22 @@ msgstr ""
 #: help:res.company,security_lead:0
 msgid ""
 "This is the days added to what you promise to customers for security purpose"
-msgstr ""
+msgstr "Tai yra saugios dienos, per kurias Jūs galite atlikti užsakymą."
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
 msgid "Cost per hour"
-msgstr ""
+msgstr "Savikaina per valandą"
 
 #. module: mrp
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Best price (not yet active!)"
-msgstr ""
+msgstr "Geriausia kaina (kol kas neaktyvuoti!)"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Product & Location"
-msgstr ""
+msgstr "Produktai ir vietos"
 
 #. module: mrp
 #: view:res.company:0
@@ -155,43 +159,46 @@ 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."
 msgstr ""
+"Operacijų skaičius, kurias gali atlikti šis darbo centras paraleliai. Jeigu "
+"darbo centras susideda iš 5 žmonių komandos, kiekis per ciklą yra 5."
 
 #. module: mrp
 #: wizard_button:product.product.procurement,init,create:0
 msgid "Ask New Products"
-msgstr ""
+msgstr "Užklausti naujų produktų"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_reordering
 msgid "Automatic Procurements"
-msgstr ""
+msgstr "Automatiniai planiniai užsakymai"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "Produkto kiekis"
 
 #. module: mrp
 #: field:mrp.production,move_lines:0
 msgid "Products Consummed"
-msgstr ""
+msgstr "Sunaudoti produktai"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
 msgid "Cycle Account"
-msgstr ""
+msgstr "Ciklo sąskaita"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Capacity Information"
-msgstr ""
+msgstr "Užimtumo informacija"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Packing Exception"
-msgstr ""
+msgstr "Važtaraščio išimtis"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
@@ -201,12 +208,12 @@ msgstr ""
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Destination Location"
-msgstr ""
+msgstr "Tikslo vieta"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analitinė informacija"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_servicemts0
@@ -216,7 +223,7 @@ msgstr ""
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Partner Ref"
-msgstr ""
+msgstr "Partnerio nuoroda"
 
 #. module: mrp
 #: help:mrp.procurement.orderpoint.compute,init,automatic:0
@@ -226,48 +233,49 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.workcenter.load,init,measure_unit:0
 msgid "Amount in hours"
-msgstr ""
+msgstr "Suma valandomis"
 
 #. module: mrp
 #: field:mrp.production,product_lines:0
 msgid "Scheduled goods"
-msgstr ""
+msgstr "Suplanuotos žaliavos"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
 msgid "you can see the minimum stock rules from product"
-msgstr ""
+msgstr "Jūs galite nustatyti minimalias atsargų taisykles produktams"
 
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
-msgstr ""
+msgstr "Nustatytas"
 
 #. module: mrp
 #: wizard_view:mrp.procurement.compute,init:0
 msgid "This wizard will schedule procurements."
-msgstr ""
+msgstr "Ši darbų grupė suplanuos užsakymus."
 
 #. module: mrp
 #: field:mrp.bom,position:0
 msgid "Internal Ref."
-msgstr ""
+msgstr "Vidinė nuoroda"
 
 #. module: mrp
-#: view:mrp.procurement:0 field:mrp.procurement,state:0
+#: view:mrp.procurement:0
+#: field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
-msgstr ""
+msgstr "Būsena"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "Stockable Production Order"
-msgstr ""
+msgstr "Sandėliuojamos produkcijos užsakymas."
 
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
-msgstr ""
+msgstr "Nuoroda į poziciją išoriniame plane."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockrfq0
@@ -277,7 +285,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,name:mrp.process_node_serviceonorder0
 msgid "Service on Order"
-msgstr ""
+msgstr "Paslaugų produktas"
 
 #. module: mrp
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -286,6 +294,8 @@ msgid ""
 "When the virtual stock goes belong the Min Quantity, Open ERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Jeigu virtualios atsargos pasiekia minimalų kiekį, Open ERP sugeneruoja "
+"planinį užsakymą, kuris leidžia pasiekti virtualių atsargų maksimalų kiekį."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockmts0
@@ -294,57 +304,60 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: view:mrp.production:0
 msgid "Production Orders"
-msgstr ""
+msgstr "Gamybos užsakymai"
 
 #. module: mrp
-#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0
+#: field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Kiekis"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
 msgid "Not urgent"
-msgstr ""
+msgstr "Neskubu"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procure Service Product"
-msgstr ""
+msgstr "Paslaugų produktų gamyba."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Confirm Production"
-msgstr ""
+msgstr "Patvirtinti gamybą"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
 #: field:stock.move,procurements:0
 msgid "Procurements"
-msgstr ""
+msgstr "Planiniai užsakymai"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production scheduled products"
-msgstr ""
+msgstr "Suplanuoti gamybiniai produktai"
 
 #. module: mrp
 #: field:mrp.workcenter,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Darbo laikas"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Details"
-msgstr ""
+msgstr "Detalės"
 
 #. module: mrp
 #: model:process.process,name:mrp.process_process_procurementprocess0
 msgid "Procurement Process"
-msgstr ""
+msgstr "Pirkimų planavimas."
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
@@ -352,20 +365,23 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Skubu"
 
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid ""
 "Rounding applied on the product quantity. For integer only values, put 1.0"
 msgstr ""
+"Produktų kiekių apvalinimas. Jeigu norite naudoti tik sveikus skaičius, "
+"pasirinkite 1.0"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Bill Of Material"
-msgstr ""
+msgstr "Komplektavimo specifikacija"
 
 #. module: mrp
 #: help:mrp.routing,location_id:0
@@ -374,21 +390,24 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
+"Nepildykite, jeigu gamybos vieta, ir galutinė produkcijos vieta sutampa. "
+"Vietos nurodomos, jeigu gaminama fiksuotoje vietoje. Tai gali būti ir "
+"kontrahento vieta, jeigu jūsų tiekėjai atlieka gamybos operacijas."
 
 #. module: mrp
 #: field:mrp.procurement,move_id:0
 msgid "Reservation"
-msgstr ""
+msgstr "Rezervavimas"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr ""
+msgstr "KS struktūra"
 
 #. module: mrp
 #: wizard_field:product.product.procurement,init,product_id:0
 msgid "product"
-msgstr ""
+msgstr "produktas"
 
 #. module: mrp
 #: selection:mrp.property,composition:0
@@ -398,22 +417,22 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Product to stock rules"
-msgstr ""
+msgstr "Produktų atsargų likučio taisyklės"
 
 #. module: mrp
 #: wizard_button:product_price,init,price:0
 msgid "Print product price"
-msgstr ""
+msgstr "Spausdinti produkto kainą"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,done:0
 msgid "Make Procurement"
-msgstr ""
+msgstr "Sukurti planinį užsakymą"
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
 msgid "Modification Date"
-msgstr ""
+msgstr "Modifikavimo data"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
@@ -422,46 +441,49 @@ msgid ""
 "Complete this only if you want automatic analytic accounting entries on "
 "production orders."
 msgstr ""
+"Užpildykite, tik jeigu Jūs norite analitinės apskaitos įrašų šiems gamybos "
+"užsakymams."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduction0
 msgid "If Procure method is Make to order and supply method is produce"
-msgstr ""
+msgstr "Jeigu gamybos metodas yra užsakyti ir tiekimo metodas yra gaminti"
 
 #. module: mrp
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr ""
+msgstr "Gamybos trukmė"
 
 #. module: mrp
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
-msgstr ""
+msgstr "Gamybos vieta"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Change Qty"
-msgstr ""
+msgstr "Pakeisti kiekį"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Force Reservation"
-msgstr ""
+msgstr "Priverstinai rezervuoti"
 
 #. module: mrp
 #: field:mrp.bom.revision,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Autorius"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Stockable Product Stock"
-msgstr ""
+msgstr "Produktai sandėlyje."
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
-msgstr ""
+msgstr "Produkto mat. vnt."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
@@ -471,59 +493,60 @@ msgstr ""
 #. module: mrp
 #: model:process.process,name:mrp.process_process_serviceproductprocess0
 msgid "Service Product Process"
-msgstr ""
+msgstr "Paslaugų produktas"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
 msgid "Procurement convert into the draft purchase order."
-msgstr ""
+msgstr "Planavimą konvertuoti į pirkimų užsakymo juodraštį."
 
 #. module: mrp
 #: field:mrp.procurement,message:0
 msgid "Latest error"
-msgstr ""
+msgstr "Pask. klaida"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
 msgid "BoM Lines"
-msgstr ""
+msgstr "KS eilutės"
 
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
 msgid "Time before prod."
-msgstr ""
+msgstr "Laikas prieš gaminimą"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Routing workcenter usage"
-msgstr ""
+msgstr "TK darbo centrų užimtumas"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consumed Products"
-msgstr ""
+msgstr "Suvartojami produktai"
 
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "Klaida! Jūs negalite sukurti pasikartojančių KS."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockmts0
 #: model:process.transition,note:mrp.process_transition_stockrfq0
 msgid "If Product type is Stockable and procure method is make to stock"
 msgstr ""
+"Jeigu produkto tipas yra sandėliuojamas ir gavybos metodas yra sandėlys"
 
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturity Lead Time"
-msgstr ""
+msgstr "Pakavimo trukmė"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4
 msgid "Exceptions Procurements to Fix"
-msgstr ""
+msgstr "Atidėti išimtiniai planavimai"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
@@ -533,40 +556,40 @@ msgstr ""
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Workcenter Operations"
-msgstr ""
+msgstr "Darbo centro operacijos"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2_gantt
 #: model:ir.ui.menu,name:mrp.menu_production_orders_start_gantt
 msgid "Production Orders Planning"
-msgstr ""
+msgstr "Gamybos užsakymų planavimas"
 
 #. module: mrp
 #: help:mrp.workcenter,time_efficiency:0
 msgid "Factor that multiplies all times expressed in the workcenter."
-msgstr ""
+msgstr "Faktorius kuris dalina visus laikus nurodytus prie darbo centro."
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
-msgstr ""
+msgstr "Vieno ciklo laikas valandomis."
 
 #. module: mrp
 #: field:mrp.production,date_finnished:0
 msgid "End Date"
-msgstr ""
+msgstr "Pabaigos data"
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
 msgid ""
 "This is the internal picking list take bring the raw materials to the "
 "production plan."
-msgstr ""
+msgstr "Tai yra vidinis važtaraštis, perduodantis žaliavas į gamybą."
 
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "In Production"
-msgstr ""
+msgstr "Gaminama"
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,qty_multiple:0
@@ -576,50 +599,52 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Waiting"
-msgstr ""
+msgstr "Laukiama"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0 view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing
+#: field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0
+#: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
-msgstr ""
+msgstr "Technologinė kortelė"
 
 #. module: mrp
 #: wizard_button:mrp.workcenter.load,init,report:0
 msgid "Print"
-msgstr ""
+msgstr "Spausdinti"
 
 #. module: mrp
 #: field:mrp.workcenter,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipas"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable and consumable"
-msgstr ""
+msgstr "Sandėliavimui ir suvartojimui"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,time_unit:0
 msgid "Per month"
-msgstr ""
+msgstr "Per mėnesį"
 
 #. module: mrp
 #: field:mrp.procurement,product_uos_qty:0
 msgid "UoS Quantity"
-msgstr ""
+msgstr "Kiekis"
 
 #. module: mrp
 #: rml:bom.structure:0
 msgid "Product Name"
-msgstr ""
+msgstr "Produkto pavadinimas"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Printing date"
-msgstr ""
+msgstr "Spausdinimo data"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_orderrfq0
@@ -630,78 +655,80 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom,revision_type:0
 msgid "indice type"
-msgstr ""
+msgstr "Revizijos tipas"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Production orders are created for the product manufacturing."
-msgstr ""
+msgstr "Gamybos užsakymas yra sukurtas."
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "WorkCenter"
-msgstr ""
+msgstr "Darbų centras"
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,product_min_qty:0
 msgid "Min Quantity"
-msgstr ""
+msgstr "Minimalus kiekis"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production orders"
-msgstr ""
+msgstr "Gamybos užsakymai"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0
+#: field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
-msgstr ""
+msgstr "KS hierarchija"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Lines"
-msgstr ""
+msgstr "Planinės eilutės"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
 msgid "If Product type is service and procure method is Make to stock"
-msgstr ""
+msgstr "Jeigu produkto tipas yra paslauga ir gavybos metodas yra sandėliuoti"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "If Product type is service"
-msgstr ""
+msgstr "Jeigu produkto tipas - paslaugos"
 
 #. module: mrp
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr ""
+msgstr "Saugios dienos"
 
 #. module: mrp
-#: view:mrp.production:0 field:mrp.production,cycle_total:0
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
 msgid "Total Cycles"
-msgstr ""
+msgstr "Iš viso ciklų"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Ready to Produce"
-msgstr ""
+msgstr "Paruošta gamybai"
 
 #. module: mrp
 #: field:mrp.bom.revision,name:0
 msgid "Modification name"
-msgstr ""
+msgstr "Modifikavimo pavadinimas"
 
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
-msgstr ""
+msgstr "KS tipas"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Exception"
-msgstr ""
+msgstr "Išimtis"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,init:0
@@ -709,11 +736,13 @@ msgid ""
 "This wizard will planify the procurement for this product. This procurement "
 "may generate task, production orders or purchase orders."
 msgstr ""
+"Tai yra vedlys planuojant užsakymą šiam produktui. Šis planinis užsakymas "
+"gali sugeneruoti užduotis, planinius užsakymus arba pirkimo užsakymus."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_mts0
 msgid "The system waits for requested products in stock."
-msgstr ""
+msgstr "Sistema laukia reikalingų produktų."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicemto0
@@ -723,82 +752,87 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
 msgid "From minimum stock rules, it goes for procure product."
-msgstr ""
+msgstr "Iš atsargų taisyklių, jie perkeliami į įsigytus produktus."
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
 msgid "Stockable Product"
-msgstr ""
+msgstr "Savikaina per valandą"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production done"
-msgstr ""
+msgstr "Gamyba baigta"
 
 #. module: mrp
-#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
+#: rml:bom.structure:0
+#: field:mrp.bom,code:0
+#: field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kodas"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "No. Of Hours"
-msgstr ""
+msgstr "Valandų skaičius"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
 msgid "Property Group"
-msgstr ""
+msgstr "Ypatybių grupė"
 
 #. module: mrp
 #: field:mrp.bom,bom_id:0
 msgid "Parent BoM"
-msgstr ""
+msgstr "Tėvinė KS"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "References"
-msgstr ""
+msgstr "Nuorodos"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0
+#: view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0
+#: wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
 msgid "Move product"
-msgstr ""
+msgstr "Perduotas produktas"
 
 #. module: mrp
 #: selection:mrp.workcenter,type:0
 msgid "Machine"
-msgstr ""
+msgstr "Mašina"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
 msgid "Make to stock"
-msgstr ""
+msgstr "Iš sandėlio"
 
 #. module: mrp
 #: field:mrp.workcenter,name:0
 msgid "Workcenter Name"
-msgstr ""
+msgstr "Darbo centro pavadinimas"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Start Production"
-msgstr ""
+msgstr "Pradėti gamybą"
 
 #. module: mrp
 #: selection:mrp.property,composition:0
@@ -810,7 +844,7 @@ msgstr ""
 msgid ""
 "Description of the workcenter. Explain here what's a cycle according to this "
 "workcenter."
-msgstr ""
+msgstr "Darbo centro parašymas. Nurodomas koks yra šio darbo centro ciklas."
 
 #. module: mrp
 #: rml:bom.structure:0
@@ -820,58 +854,62 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.workcenter,type:0
 msgid "Human Resource"
-msgstr ""
+msgstr "Žmogiškasis išteklius"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
 #: field:mrp.routing,workcenter_lines:0
 msgid "Workcenters"
-msgstr ""
+msgstr "Darbo centrai"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "UOM"
-msgstr ""
+msgstr "Mat. vnt."
 
 #. module: mrp
 #: selection:mrp.procurement,procure_method:0
 msgid "on order"
-msgstr ""
+msgstr "Užsakant"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc0
 #: model:ir.ui.menu,name:mrp.mrp_Sched_all
 msgid "Compute All Schedulers"
-msgstr ""
+msgstr "Apskaičiuoti planavimą"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
 msgid "Nbr of cycle"
-msgstr ""
+msgstr "Ciklų sk."
 
 #. module: mrp
-#: field:mrp.bom,name:0 field:mrp.procurement,name:0
-#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0 field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0
+#: field:mrp.procurement,name:0
+#: rml:mrp.production.order:0
+#: field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0
+#: field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0
+#: field:stock.warehouse.orderpoint,name:0
 msgid "Name"
-msgstr ""
+msgstr "Pavadinimas"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycle"
-msgstr ""
+msgstr "Ciklų kiekis"
 
 #. module: mrp
 #: wizard_field:mrp.workcenter.load,init,measure_unit:0
 msgid "Amount measuring unit"
-msgstr ""
+msgstr "Suma matavimo vienetų"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Run procurement"
-msgstr ""
+msgstr "Vykdyti užsakymą"
 
 #. module: mrp
 #: help:res.company,schedule_range:0
@@ -884,189 +922,192 @@ msgstr ""
 #. module: mrp
 #: field:mrp.workcenter,time_efficiency:0
 msgid "Time Efficiency"
-msgstr ""
+msgstr "Laiko išnaudojimo efektyvumas"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
 msgid "Security days for each manufacturing operation."
-msgstr ""
+msgstr "Saugios dienos kiekvienai gamybos operacijai."
 
 #. module: mrp
 #: wizard_view:mrp.procurement.compute.all,init:0
 msgid "Scheduler Parameters"
-msgstr ""
+msgstr "Planavimo parametrai"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
 msgid "A cycle is defined in the workcenter definition."
-msgstr ""
+msgstr "Ciklai apibrėžiami darbo centruose."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,measure_unit:0
 msgid "Amount in cycles"
-msgstr ""
+msgstr "Apkrovimas pagal ciklus"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
 msgid "Finished Products Location"
-msgstr ""
+msgstr "Baigtos produkcijos vieta"
 
 #. module: mrp
 #: wizard_field:product.product.procurement,init,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Matavimo vienetas"
 
 #. module: mrp
 #: field:mrp.procurement,procure_method:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Gavimo būdas"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Analitinis žurnalas"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,time_unit:0
 msgid "Per week"
-msgstr ""
+msgstr "Per savaitę"
 
 #. module: mrp
 #: wizard_button:mrp.procurement.compute,init,compute:0
 #: wizard_button:mrp.procurement.compute.all,init,compute:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,compute:0
 msgid "Compute Procurements"
-msgstr ""
+msgstr "Skaičiuoti planinius užsakymus"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Wait for available products for reservation"
-msgstr ""
+msgstr "Laukti kol bus pasiekiami produktai rezervacijai"
 
 #. module: mrp
 #: wizard_button:change_production_qty,confirm,validate:0
 msgid "Validate"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
 msgid "Procurement Purchase"
-msgstr ""
+msgstr "Pirkimų planavimas"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,hour:0
 msgid "Nbr of hour"
-msgstr ""
+msgstr "Valandų sk."
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Notes"
-msgstr ""
+msgstr "Pastabos"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
-msgstr ""
+msgstr "Komplektavimo specifikacija"
 
 #. module: mrp
 #: wizard_view:mrp.workcenter.load,init:0
 msgid "Select time unit"
-msgstr ""
+msgstr "Pasirinkti laiko vienetą"
 
 #. module: mrp
 #: wizard_field:product_price,init,number:0
 msgid "Number of products to produce"
-msgstr ""
+msgstr "Kiekis produktų, kurie turi būti pagaminti"
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr ""
+msgstr "Vieta, kurioje talpinami pabaigti produktai ."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material routing"
-msgstr ""
+msgstr "Medžiagų techninės kortelės"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,time_unit:0
 msgid "Day by day"
-msgstr ""
+msgstr "Kiekvieną dieną"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum stock rule"
-msgstr ""
+msgstr "Atsargų likučio taisyklės"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Revisions"
-msgstr ""
+msgstr "Revizijos"
 
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Product Efficiency"
-msgstr ""
+msgstr "Produkto efektyvumas"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_warehouse_orderpoint
 msgid "Orderpoint minimum rule"
-msgstr ""
+msgstr "Užsakymo minimumo taisyklė"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicemts0
 msgid "Service Make to Stock"
-msgstr ""
+msgstr "Paslaugų paruošimas"
 
 #. module: mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sale Ref"
-msgstr ""
+msgstr "Pardavimo nuoroda"
 
 #. module: mrp
-#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0
+#: field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
-msgstr ""
+msgstr "Svarbumas"
 
 #. module: mrp
 #: field:mrp.procurement,location_id:0
 #: field:stock.warehouse.orderpoint,location_id:0
 msgid "Location"
-msgstr ""
+msgstr "Vieta"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_new
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_new
 msgid "New Procurement"
-msgstr ""
+msgstr "Naujas planinis užsakymas"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Production Order N° :"
-msgstr ""
+msgstr "Gamybos užsakymo Nr. :"
 
 #. module: mrp
 #: selection:mrp.workcenter,type:0
 msgid "Tool"
-msgstr ""
+msgstr "Priemonė"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid "Location where the system will look for products used in raw materials."
-msgstr ""
+msgid ""
+"Location where the system will look for products used in raw materials."
+msgstr "Vieta, iš kurios bus imamos žaliavos."
 
 #. module: mrp
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,date_planned:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Suplanuota data"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "Procurement orders"
-msgstr ""
+msgstr "Planuojami užsakymai"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_mts0
@@ -1076,22 +1117,23 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
 msgid "If product type is service and procure method is Make to order"
-msgstr ""
+msgstr "Jeigu produkto tipas yra paslauga ir gavybos metodas yra užsakyti"
 
 #. module: mrp
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range"
-msgstr ""
+msgstr "Suplanuota data"
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,product_max_qty:0
 msgid "Max Quantity"
-msgstr ""
+msgstr "Maksimalus kiekis"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement
+#: view:mrp.procurement:0
 msgid "Procurement"
-msgstr ""
+msgstr "Planinis užsakymas"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.product_procurement_wizard
@@ -1101,48 +1143,49 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_price
 msgid "Product Cost Structure"
-msgstr ""
+msgstr "Produkto savikainos struktūra"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "Minimum Stock Procure"
-msgstr ""
+msgstr "Minimali atsargų gamyba"
 
 #. module: mrp
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr ""
+msgstr "Tai yra saugus laikas visiems pirkimo užsakymams."
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "BoM Structure"
-msgstr ""
+msgstr "KS struktūra"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Pradžios data"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
-msgstr ""
+msgstr "Valandos sąskaita"
 
 #. module: mrp
 #: selection:mrp.bom,revision_type:0
 msgid "alphabetical indices"
-msgstr ""
+msgstr "abėcėlinis indeksas"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Procurement for raw materials."
-msgstr ""
+msgstr "Žaliavų planavimas"
 
 #. module: mrp
-#: view:mrp.procurement:0 field:mrp.procurement,note:0
+#: view:mrp.procurement:0
+#: field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
-msgstr ""
+msgstr "Pastaba"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
@@ -1152,52 +1195,60 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom,method:0
 msgid "Method"
-msgstr ""
+msgstr "Metodas"
 
 #. module: mrp
 #: wizard_view:product_price,init:0
 msgid "Paid ?"
-msgstr ""
+msgstr "Apmokėta?"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Define a routing to describe the manufacturing steps."
-msgstr ""
+msgstr "Nustatykite maršrutus apibūdinančius gamybos etapus."
 
 #. module: mrp
-#: field:mrp.bom,active:0 field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0
+#: field:stock.warehouse.orderpoint,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktyvus"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
 msgid "Procure Products"
-msgstr ""
+msgstr "Užsakyti produktus"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0 view:mrp.property:0
+#: view:mrp.bom:0
+#: field:mrp.bom,property_ids:0
+#: view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0
+#: view:mrp.property:0
 msgid "Properties"
-msgstr ""
+msgstr "Ypatybės"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0
+#: field:mrp.production,date_planned:0
 msgid "Scheduled date"
-msgstr ""
+msgstr "Suplanuota data"
 
 #. module: mrp
-#: view:mrp.procurement:0 view:mrp.production:0
+#: view:mrp.procurement:0
+#: view:mrp.production:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Papildoma informacija"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Define the product structure, with sub-products and/or components."
 msgstr ""
+"Nustatykite gaminio struktūrą, su sub-produktais ir/arba sudėtinėmis dalimis."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
@@ -1205,52 +1256,54 @@ msgid ""
 "Procurement is created if the product quantity is lower than the minimum "
 "limit."
 msgstr ""
+"Pirkimas yra sukurtas, jei produkto kiekis yra mažesnė už minimalią ribą."
 
 #. module: mrp
 #: field:mrp.procurement,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Uždarymo data"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Bendroji sąskaita"
 
 #. module: mrp
 #: field:mrp.property,composition:0
 msgid "Properties composition"
-msgstr ""
+msgstr "Ypatybių jungimas"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 #: model:ir.ui.menu,name:mrp.menu_production_orders_waiting4
 msgid "Production Orders Waiting Products"
-msgstr ""
+msgstr "Gamybos užsakymai laukiantys produktų"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "SO Number"
-msgstr ""
+msgstr "Pardavimo užsakymo numeris"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_change_production_qty
 msgid "Change Product Qty."
-msgstr ""
+msgstr "Pakeisti produkto kiekį"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0
+#: selection:mrp.production,state:0
 msgid "Done"
-msgstr ""
+msgstr "Atlikta"
 
 #. module: mrp
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
-msgstr ""
+msgstr "Gamybos kiekis bus apvalinamas."
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
-msgstr ""
+msgstr "Pakartotino užsakymo modelis"
 
 #. module: mrp
 #: constraint:ir.model:0
@@ -1261,13 +1314,13 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "Central document to procure products"
-msgstr ""
+msgstr "Pagrindinis dokumentas gaminant produktus"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_action3
 msgid "Production Orders in Progress"
-msgstr ""
+msgstr "Vykdomi gamybos užsakymai"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_stock_warehouse_orderpoint
@@ -1276,42 +1329,46 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_action_orderpoint_form
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules"
-msgstr ""
+msgstr "Atsargų likučio taisyklės"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
-msgstr ""
+msgstr "Užimtumas per ciklą"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0 rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0
+#: field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0
+#: rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produktas"
 
 #. module: mrp
-#: view:mrp.production:0 field:mrp.production,hour_total:0
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Iš viso valandų"
 
 #. module: mrp
 #: field:mrp.production,location_src_id:0
 msgid "Raw Materials Location"
-msgstr ""
+msgstr "Žaliavų vieta"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr ""
+msgstr "Produkto KS struktūra"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0
+#: field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "Produkto mat. vnt."
 
 #. module: mrp
 #: help:mrp.procurement,origin:0
@@ -1319,59 +1376,66 @@ msgid ""
 "Reference of the document that created this procurement.\n"
 "This is automatically completed by Open ERP."
 msgstr ""
+"Nuoroda į dokumentą, kuris sugeneravo gamybos užsakymą.\n"
+"Jis automatiškai užpildomas Open ERP."
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products"
-msgstr ""
+msgstr "Gamybos produktai"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduct0
 msgid "Product type is Stockable and procure method is make to stock"
-msgstr ""
+msgstr "Produkto tipas yra sandėliuojamas ir gavybos metodas yra sandėlys."
 
 #. module: mrp
-#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0
+#: help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
+"KS ar jos komponenčių galiojimas. Palikti tuščią, jeigu visada galioja."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0
+#: field:mrp.production,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "Pardavimo vnt."
 
 #. module: mrp
 #: field:mrp.procurement,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "Matavimo vnt."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
 msgid "Workcenter"
-msgstr ""
+msgstr "Darbų centras"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
 msgid "Very Urgent"
-msgstr ""
+msgstr "Labai skubu"
 
 #. module: mrp
 #: field:mrp.procurement,purchase_id:0
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "Pirkimo užsakymas"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Workcenters"
-msgstr ""
+msgstr "Gamybos darbų centrai"
 
 #. module: mrp
 #: view:mrp.property.group:0
 msgid "Properties categories"
-msgstr ""
+msgstr "Ypatybių kategorijos"
 
 #. module: mrp
 #: help:mrp.procurement,procure_method:0
@@ -1379,68 +1443,72 @@ msgid ""
 "If you encode manually a procurement, you probably want to use a make to "
 "order method."
 msgstr ""
+"Jeigu Jūs rankiniu būdu vykdote gavybos užsakymą, jūs tikriausiai norėsite "
+"naudoti užsakimų metodą."
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Source Location"
-msgstr ""
+msgstr "Šaltinio vieta"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 msgid "Stockable Order Request"
-msgstr ""
+msgstr "Užsakymų planavimas"
 
 #. module: mrp
-#: view:mrp.production:0 view:mrp.production.product.line:0
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
 msgid "Scheduled Products"
-msgstr ""
+msgstr "Suplanuoti produktai"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products Consommation"
-msgstr ""
+msgstr "Gamybos produktų vartojimas"
 
 #. module: mrp
 #: selection:mrp.bom,revision_type:0
 msgid "numeric indices"
-msgstr ""
+msgstr "Skaitmeniniai indeksai"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
 msgid "If Procure method is Make to order and supply method is buy"
-msgstr ""
+msgstr "Jeigu gamybos metodas yra užsakyti ir tiekimo metodas yra pirkti"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
 msgid "if Product type is Stockable in procurement order"
-msgstr ""
+msgstr "Jeigu produkto tipas yra sandėliuojamas gamybos užsakyme"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0 rml:mrp.production.order:0
+#: view:mrp.production:0
+#: rml:mrp.production.order:0
 msgid "Work Orders"
-msgstr ""
+msgstr "Darbo užsakymai"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
 msgid "Cost per cycle"
-msgstr ""
+msgstr "Savikaina per ciklą"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of material revisions"
-msgstr ""
+msgstr "Komplektacijos specifikacijos revizija"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Planification"
-msgstr ""
+msgstr "Planavimai"
 
 #. module: mrp
 #: rml:bom.structure:0
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "BOM"
-msgstr ""
+msgstr "KS"
 
 #. module: mrp
 #: help:mrp.bom,type:0
@@ -1452,21 +1520,25 @@ msgid ""
 "sale order to the picking without going through the production order.The "
 "normal BoM will generate one production order per BoM level."
 msgstr ""
+"Produktų gamybos užsakymo komplekto specifikacijos linijų automatinis "
+"skaičiavimas. \"Įprastas KS\" sukurs vieną gamybos užsakymą per "
+"komplektavimo specifikacijos lygius.  Jeigu nustatysite \"numatyta\" "
+"produktai bus pakeisti komponentais be gamybos užsakymo."
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
 msgid "Time for 1 cycle (hour)"
-msgstr ""
+msgstr "Laikas vienam ciklui (valandomis)"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,done:0
 msgid "Your procurement request has been sent !"
-msgstr ""
+msgstr "Jūsų planinis užsakymas buvo išsiųstas!"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,init:0
 msgid "Internal Procurement Request"
-msgstr ""
+msgstr "Vidinis planavimo užsakymas"
 
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
@@ -1475,78 +1547,78 @@ msgstr ""
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
-msgstr ""
+msgstr "Gamybos užsakymas"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Compute Data"
-msgstr ""
+msgstr "Apskaičiuoti duomenis"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Categories"
-msgstr ""
+msgstr "Ypatybių kategorijos"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1
 #: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1
 msgid "Compute Procurements Only"
-msgstr ""
+msgstr "Skaičiuoti tik planinius užsakymus"
 
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
 msgid "Product UoS Qty"
-msgstr ""
+msgstr "Produkto kiekis vnt."
 
 #. module: mrp
 #: rml:bom.structure:0
 #: model:ir.actions.report.xml,name:mrp.report_bom_structure
 msgid "BOM Structure"
-msgstr ""
+msgstr "KS struktūra"
 
 #. module: mrp
 #: field:mrp.bom,date_stop:0
 msgid "Valid Until"
-msgstr ""
+msgstr "Galioja iki"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action11
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11
 msgid "Temporary Procurement Exceptions"
-msgstr ""
+msgstr "Laikinos suplanuotų užsakymų išimtys"
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
 msgid "Valid From"
-msgstr ""
+msgstr "Galioja nuo"
 
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Normal BoM"
-msgstr ""
+msgstr "Įprastas KS"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Qty"
-msgstr ""
+msgstr "Produkto mat. vnt. kiekis"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Patvirtinta"
 
 #. module: mrp
 #: wizard_view:mrp.procurement.compute,init:0
 #: wizard_view:mrp.procurement.orderpoint.compute,init:0
 msgid "Parameters"
-msgstr ""
+msgstr "Parametrai"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Confirm"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
@@ -1558,12 +1630,12 @@ msgstr ""
 msgid ""
 "Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
 "production."
-msgstr ""
+msgstr "Gamybos efektyvumas. 0,9 reiškia, kad nuostolis yra 10% gamybos."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
-msgstr ""
+msgstr "Produkto apvalinimas"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,name:0
@@ -1573,84 +1645,85 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Recreate Picking"
-msgstr ""
+msgstr "Atkurti važtaraštį"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceonorder0
 msgid "If procurement is make to order"
-msgstr ""
+msgstr "Jei įsigijimai yra padaryti pagal užsakymą."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Order"
-msgstr ""
+msgstr "Užsakant"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 msgid "Minimum Stock Rule"
-msgstr ""
+msgstr "Minimali atsargų taisyklė"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action_new
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action_new
 msgid "New Bill of Materials"
-msgstr ""
+msgstr "Nauja komplektavimo specifikacija"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
 msgid "Time after prod."
-msgstr ""
+msgstr "Laikas po gaminimo"
 
 #. module: mrp
 #: wizard_field:mrp.workcenter.load,init,time_unit:0
 msgid "Type of period"
-msgstr ""
+msgstr "Periodo tipas"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Total Qty"
-msgstr ""
+msgstr "Kiek iš viso"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,hour_nbr:0
 msgid "Number of Hours"
-msgstr ""
+msgstr "Valandų kiekis"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action
 msgid "Procurement Orders"
-msgstr ""
+msgstr "Planiniai užsakymai"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property
 msgid "Property"
-msgstr ""
+msgstr "Ypatybė"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
 msgid "Parent Routing"
-msgstr ""
+msgstr "Tėvinė techn. kortelė"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
 msgid "Time in hours for the setup."
-msgstr ""
+msgstr "Laikas valandomis pradėti gamybai"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Atšaukta"
 
 #. module: mrp
 #: selection:mrp.property,composition:0
 msgid "plus"
-msgstr ""
+msgstr "plius"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0
+#: field:mrp.procurement,bom_id:0
 msgid "BoM"
-msgstr ""
+msgstr "KS"
 
 #. module: mrp
 #: help:mrp.bom,routing_id:0
@@ -1660,83 +1733,90 @@ msgid ""
 "operations and to plan futur loads on workcenters based on production "
 "plannification."
 msgstr ""
+"Tai yra darbų sąrašas (sąrašas darbo centrų) pagaminti pabaigtus produktus. "
+"Apvalinimas dažniausiai naudojamas skaičiuoti darbo centro kaštus per "
+"operacijas ir planuoti darbo centrų apkrovimą ateityje."
 
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "Laukiama žaliavų"
 
 #. module: mrp
 #: model:process.process,name:mrp.process_process_stockableproductprocess0
 msgid "Stockable Product Process"
-msgstr ""
+msgstr "Produktai sandėlyje"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_new
 #: model:ir.ui.menu,name:mrp.menu_production_orders_new
 msgid "New Production Order"
-msgstr ""
+msgstr "Naujas gamybos užsakymas"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "A Request for Quotation is created and sent to the supplier."
-msgstr ""
+msgstr "Užklausa yra sukurta ir išsiųsta tiekėjams."
 
 #. module: mrp
 #: field:mrp.bom.revision,last_indice:0
 msgid "last indice"
-msgstr ""
+msgstr "Pask. revizija"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0
+#: view:mrp.bom.revision:0
 msgid "BoM Revisions"
-msgstr ""
+msgstr "KS revizijos"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Retry"
-msgstr ""
+msgstr "Pakartoti"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0
+#: selection:mrp.production,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Juodraštis"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
 msgid "When any procuere products, it comes into the prpcurement orders"
-msgstr ""
+msgstr "Kai gaminamas produktas perkeliamas į užsakymus."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 #: model:ir.ui.menu,name:mrp.menu_production_orders_start
 msgid "Production Orders To Start"
-msgstr ""
+msgstr "Nepradėti gamybos užsakymai"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Reason"
-msgstr ""
+msgstr "Užsakymo priežastis"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
 msgid "An entry is being made from billing material to routing."
 msgstr ""
+"Įrašas yra sukuriamas iš atsiskaitymo medžiagų technologinės kortelės ."
 
 #. module: mrp
 #: help:mrp.workcenter,timesheet_id:0
 msgid "The normal working time of the workcenter."
-msgstr ""
+msgstr "Normalus darbo centro darbo laikas."
 
 #. module: mrp
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Order to Max"
-msgstr ""
+msgstr "Užsakyti maksimalų"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -1744,122 +1824,129 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
 #: model:process.node,name:mrp.process_node_billofmaterial0
 msgid "Bill of Materials"
-msgstr ""
+msgstr "Komplektavimo specifikacijos"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procureserviceproduct0
 msgid "In procurement order, if product type is service"
-msgstr ""
+msgstr "Gamybos užsakyme, jei produkto tipas yra paslauga"
 
 #. module: mrp
 #: selection:mrp.procurement,procure_method:0
 msgid "from stock"
-msgstr ""
+msgstr "Iš sandėlio"
 
 #. module: mrp
-#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
-#: view:mrp.routing:0 view:mrp.routing.workcenter:0
+#: view:mrp.bom:0
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+#: view:mrp.routing:0
+#: view:mrp.routing.workcenter:0
 msgid "General Information"
-msgstr ""
+msgstr "Bendra informacija"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Productions"
-msgstr ""
+msgstr "Gamyba"
 
 #. module: mrp
 #: wizard_button:product.product.procurement,done,end:0
 msgid "Close"
-msgstr ""
+msgstr "Uždaryti"
 
 #. module: mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
-msgstr ""
+msgstr "Pardavimo pavadinimas"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Create minimum stock rules"
-msgstr ""
+msgstr "Sukurti minimalaus atsargų likučio taisykles"
 
 #. module: mrp
 #: wizard_field:product.product.procurement,init,warehouse_id:0
 #: field:stock.warehouse.orderpoint,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Sandėlis"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
 #: field:stock.move,production_id:0
 msgid "Production"
-msgstr ""
+msgstr "Gamyba"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service Product"
-msgstr ""
+msgstr "Paslaugų produktas"
 
 #. module: mrp
 #: field:mrp.procurement,close_move:0
 msgid "Close Move at end"
-msgstr ""
+msgstr "Uždarymo perkėlimas pabaigoje"
 
 #. module: mrp
 #: wizard_view:change_production_qty,confirm:0
 msgid "Change Product Qty"
-msgstr ""
+msgstr "Pakeisti produkto kiekį"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0 view:mrp.property:0
-#: field:mrp.property,description:0 field:mrp.property.group,description:0
-#: view:mrp.routing:0 field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0
+#: view:mrp.property:0
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+#: view:mrp.routing:0
+#: field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0
+#: view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
-msgstr ""
+msgstr "Aprašymas"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Running"
-msgstr ""
+msgstr "Veikiantis"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_root
 msgid "Manufacturing"
-msgstr ""
+msgstr "Gamyba"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action3
 msgid "Unscheduled procurements"
-msgstr ""
+msgstr "Neįvykdyti užsakymai"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action
 #: model:ir.ui.menu,name:mrp.menu_bom_tree
 msgid "Bill of Material Structure"
-msgstr ""
+msgstr "KS struktūra"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
 msgid "Workcenter load"
-msgstr ""
+msgstr "Darbo centrų apkrovimas"
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
 msgid "Time in hours for the cleaning."
-msgstr ""
+msgstr "Laikas valandomis pasiruošimui."
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Details"
-msgstr ""
+msgstr "Planinis užsakymas detaliau"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
 msgid "You can see its bill of material which are used to make product"
-msgstr ""
+msgstr "Jūs galite pamatyti KS kuri buvo naudojama šiam produktui"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
@@ -1869,20 +1956,21 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Stock"
-msgstr ""
+msgstr "Sandėlyje"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0
+#: rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seka"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
-msgstr ""
+msgstr "Komplektavimo specifikacijų komponentai"
 
 #. module: mrp
 #: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
@@ -1931,3 +2019,93 @@ msgstr ""
 #: view:report.mrp.inout:0
 msgid "Stock value variation"
 msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next production orders"
+msgstr ""
+
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Šiam produktui nenustatytas tiekėjas!"
+
+#, python-format
+#~ msgid "Product name"
+#~ msgstr "Produkto pavadinimas"
+
+#, python-format
+#~ msgid "products"
+#~ msgstr "produktai"
+
+#, python-format
+#~ msgid "Workcenter name"
+#~ msgstr "Darbo centro pavadinimas"
+
+#, python-format
+#~ msgid "Product Quantity"
+#~ msgstr "Produktų kiekis"
+
+#, python-format
+#~ msgid "Product Standard Price"
+#~ msgstr "Produkto kaina"
+
+#, python-format
+#~ msgid "from stock: products assigned."
+#~ msgstr "iš atsargų: produktai yra rezervuoti."
+
+#, python-format
+#~ msgid "from stock and no minimum orderpoint rule defined"
+#~ msgstr "iš atsargų ir nenustatyta minimali atsargų užsakymo taisyklė"
+
+#, python-format
+#~ msgid "No BoM defined for this product !"
+#~ msgstr "Šiam produktui nenustatyta komplektavimo specifikacija!"
+
+#, python-format
+#~ msgid "Invalid action !"
+#~ msgstr "Neleistinas veiksmas!"
+
+#, python-format
+#~ msgid "Hours Cost"
+#~ msgstr "Valandų kaina"
+
+#, python-format
+#~ msgid "SUBTOTAL"
+#~ msgstr "Tarpinė suma"
+
+#, python-format
+#~ msgid "Unit Product Price"
+#~ msgstr "Produkto vieneto kaina"
+
+#~ msgid "Qty"
+#~ msgstr "Kiekis"
+
+#~ msgid "Create Procurement"
+#~ msgstr "Sukurti planinį užsakymą"
+
+#, python-format
+#~ msgid "Product uom"
+#~ msgstr "Produkto mat. vnt."
+
+#, python-format
+#~ msgid "Cycles Cost"
+#~ msgstr "Ciklo kaina"
+
+#, python-format
+#~ msgid "No address defined for the supplier"
+#~ msgstr "Tiekėjui nenustatytas adresas"
+
+#~ msgid "Production workcenters used"
+#~ msgstr "Darbo centrų naudojimas"
+
+#, python-format
+#~ msgid "Product quantity"
+#~ msgstr "Produkto kiekis"
+
+#, python-format
+#~ msgid "TOTAL"
+#~ msgstr "Iš viso"
+
+#, python-format
+#~ msgid "Product supplier"
+#~ msgstr "Produkto tiekėjas"
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 5c744899ee2..3fbfad8e4dc 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* mrp
+#	* mrp
 #
 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"
-"PO-Revision-Date: 2010-05-21 08:19+0000\n"
+"PO-Revision-Date: 2010-07-21 18:55+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-06-22 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -33,9 +33,9 @@ msgid ""
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
 msgstr ""
-"Wyzwala automatyczne nabycie dla wszystkich produktów o zapasie poniżej 0. "
-"Prawdopodobnie nie powinieneś stosować tej opcji. Sugerujemy ustawienie "
-"konfiguracji produktów 'Na zamówienie'."
+"Wyzwala automatyczne zapotrzebowanie dla wszystkich produktów o zapasie "
+"poniżej 0. Prawdopodobnie nie powinieneś stosować tej opcji. Sugerujemy "
+"ustawienie konfiguracji produktów 'Na zamówienie'."
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
@@ -45,7 +45,7 @@ msgstr "Planowanie zasobów produkcyjnych (MRP)"
 #. module: mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
@@ -62,7 +62,7 @@ msgstr "Oblicz tylko reguły minimalnych zapasów"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
 msgid "Exceptions Procurements"
-msgstr "Wyjątki nabycia"
+msgstr "Wyjątki zapotrzebowania"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -91,12 +91,14 @@ msgid "Stockable Stock"
 msgstr "Zapas rejestrowany"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0
+#: field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Pochodzenie"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
 msgid "Configuration"
 msgstr "Konfiguracja"
 
@@ -171,11 +173,12 @@ msgstr "Pytaj o nowe produkty"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_reordering
 msgid "Automatic Procurements"
-msgstr "Automatyczne nabycia"
+msgstr "Automatyczne zapotrzebowania"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Ilość produktu"
@@ -203,7 +206,7 @@ msgstr "Wyjątek przesunięcia"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
 msgid "A purchase order is created for a sub-contracting demand."
-msgstr ""
+msgstr "Zamówienie zakupu zostało utworzone dla podwykonawcy."
 
 #. module: mrp
 #: rml:mrp.production.order:0
@@ -254,7 +257,7 @@ msgstr "Zestaw / Fantom"
 #. module: mrp
 #: wizard_view:mrp.procurement.compute,init:0
 msgid "This wizard will schedule procurements."
-msgstr "Ten kreator zaplanuje nabycia."
+msgstr "Ten kreator zaplanuje zapotrzebowania."
 
 #. module: mrp
 #: field:mrp.bom,position:0
@@ -262,7 +265,8 @@ msgid "Internal Ref."
 msgstr "Wewn. odnośnik"
 
 #. module: mrp
-#: view:mrp.procurement:0 field:mrp.procurement,state:0
+#: view:mrp.procurement:0
+#: field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Stan"
@@ -295,7 +299,7 @@ msgid ""
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
 "Kiedy zapas wirtualny będzie poniżej ilości minimalnej, to Open ERP "
-"wygeneruje nabycie, aby zapas wzrósł do wartości maksymalnej."
+"wygeneruje zapotrzebowanie, aby zapas wzrósł do wartości maksymalnej."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockmts0
@@ -304,26 +308,29 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: view:mrp.production:0
 msgid "Production Orders"
 msgstr "Zamówienia produkcji"
 
 #. module: mrp
-#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0
+#: field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Ilość"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Nie pilne"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procure Service Product"
-msgstr ""
+msgstr "Zapotrzebowanie na usługę"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -334,7 +341,7 @@ msgstr "Potwierdź produkcję"
 #: model:process.node,name:mrp.process_node_purchaseprocure0
 #: field:stock.move,procurements:0
 msgid "Procurements"
-msgstr "Nabycia"
+msgstr "Zapotrzebowania"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
@@ -354,15 +361,16 @@ msgstr "Szczegóły"
 #. module: mrp
 #: model:process.process,name:mrp.process_process_procurementprocess0
 msgid "Procurement Process"
-msgstr "Proces nabycia"
+msgstr "Proces zapotrzebowania"
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Zaplanowana data"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Pilne"
 
@@ -423,7 +431,7 @@ msgstr "Drukuj cenę produktu"
 #. module: mrp
 #: wizard_view:product.product.procurement,done:0
 msgid "Make Procurement"
-msgstr "Wykonaj nabycie"
+msgstr "Wykonaj zapotrzebowanie"
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
@@ -478,24 +486,25 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "JS produktu"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Production Procure Products"
-msgstr ""
+msgstr "Zapotrzebowanie produktów z produkcji"
 
 #. module: mrp
 #: model:process.process,name:mrp.process_process_serviceproductprocess0
 msgid "Service Product Process"
-msgstr ""
+msgstr "Proces usługi"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
 msgid "Procurement convert into the draft purchase order."
-msgstr "Nabycie zmienia się w projekt zamówienia zakupu."
+msgstr "Zapotrzebowanie zmienia się w projekt zamówienia zakupu."
 
 #. module: mrp
 #: field:mrp.procurement,message:0
@@ -544,7 +553,7 @@ msgstr "Czas produkcji"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4
 msgid "Exceptions Procurements to Fix"
-msgstr ""
+msgstr "Wyjątki zapotrzebowania do poprawienia"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
@@ -602,8 +611,10 @@ msgid "Waiting"
 msgstr "Oczekiwanie"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0 view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing
+#: field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0
+#: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Marszruta"
@@ -676,14 +687,15 @@ msgid "Production orders"
 msgstr "Zamówienia produkcji"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0
+#: field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr "Hierarchia Zest. Mat."
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Lines"
-msgstr "Pozycje nabycia"
+msgstr "Pozycje zapotrzebowania"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -702,7 +714,8 @@ msgid "Security Days"
 msgstr "Dni na wszelki wypadek"
 
 #. module: mrp
-#: view:mrp.production:0 field:mrp.production,cycle_total:0
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "Suma cykli"
 
@@ -732,8 +745,8 @@ msgid ""
 "This wizard will planify the procurement for this product. This procurement "
 "may generate task, production orders or purchase orders."
 msgstr ""
-"Ten kreator zaplanuje nabycie dla tego produktu. Nabycie może wygenerować "
-"zadania, zamówienia produkcji lub zamówienia zakupu."
+"Ten kreator zaplanuje zapotrzebowanie dla tego produktu. Zapotrzebowanie "
+"może wygenerować zadania, zamówienia produkcji lub zamówienia zakupu."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_mts0
@@ -748,7 +761,7 @@ msgstr "Zamówienie usług Rejestrowanych"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
 msgid "From minimum stock rules, it goes for procure product."
-msgstr "Z reguł minimalnych zapasów jest tworzone nabycie produktu."
+msgstr "Z reguł minimalnych zapasów jest tworzone zapotrzebowanie produktu."
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -762,7 +775,9 @@ msgid "Production done"
 msgstr "Produkcja wykonana"
 
 #. module: mrp
-#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
+#: rml:bom.structure:0
+#: field:mrp.bom,code:0
+#: field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Kod"
@@ -774,7 +789,8 @@ msgstr "Liczba godzin"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Grupa właściwości"
 
@@ -789,12 +805,14 @@ msgid "References"
 msgstr "Odnośniki"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0
+#: view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0
+#: wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -876,10 +894,14 @@ msgid "Nbr of cycle"
 msgstr "Liczba cykli"
 
 #. module: mrp
-#: field:mrp.bom,name:0 field:mrp.procurement,name:0
-#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0 field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0
+#: field:mrp.procurement,name:0
+#: rml:mrp.production.order:0
+#: field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0
+#: field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0
+#: field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Nazwa"
 
@@ -896,7 +918,7 @@ msgstr "Jednostka miary wielkości"
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Run procurement"
-msgstr "Uruchom nabycie"
+msgstr "Uruchom zapotrzebowanie"
 
 #. module: mrp
 #: help:res.company,schedule_range:0
@@ -905,9 +927,9 @@ msgid ""
 "procurements. All procurement that are not between today and today+range are "
 "skipped for futur computation."
 msgstr ""
-"To jest rama czasowa do obliczeń planisty. Wszystkie babycia, które nie "
-"znajdują się dzisiaj a dzisiaj + zakres planowania są pomijane w "
-"obliczeniach."
+"To jest rama czasowa do obliczeń planisty. Wszystkie zapotrzebowania, "
+"których daty są poza zakresem od (dzisiaj) do (dzisiaj + zakres planowania) "
+"są pomijane w obliczeniach."
 
 #. module: mrp
 #: field:mrp.workcenter,time_efficiency:0
@@ -947,7 +969,7 @@ msgstr "Jednostka miary"
 #. module: mrp
 #: field:mrp.procurement,procure_method:0
 msgid "Procurement Method"
-msgstr "Metoda nabycia"
+msgstr "Metoda zpotrzebowania"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -964,7 +986,7 @@ msgstr "Na tydzień"
 #: wizard_button:mrp.procurement.compute.all,init,compute:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,compute:0
 msgid "Compute Procurements"
-msgstr "Oblicz nabycia"
+msgstr "Oblicz zapotrzebowania"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
@@ -979,7 +1001,7 @@ msgstr "Zatwierdź"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
 msgid "Procurement Purchase"
-msgstr "Nabycie przez zakup"
+msgstr "Zapotrzebowanie zakupu"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,hour:0
@@ -992,7 +1014,8 @@ msgid "Notes"
 msgstr "Uwagi"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "Zestawienie materiałowe"
@@ -1053,7 +1076,8 @@ msgid "Sale Ref"
 msgstr "Odnośnik sprzedaży"
 
 #. module: mrp
-#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0
+#: field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Priorytet"
@@ -1068,7 +1092,7 @@ msgstr "Strefa magazynowa"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_new
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_new
 msgid "New Procurement"
-msgstr "Nowe nabycie"
+msgstr "Nowe zapotrzebowanie"
 
 #. module: mrp
 #: rml:mrp.production.order:0
@@ -1082,7 +1106,8 @@ msgstr "Narzędzie"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid "Location where the system will look for products used in raw materials."
+msgid ""
+"Location where the system will look for products used in raw materials."
 msgstr ""
 "Strefa, w której system oczekuje produktów jako materiałów do produkcji."
 
@@ -1095,7 +1120,7 @@ msgstr "Planowana data"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "Procurement orders"
-msgstr "Zamówienia nabycia"
+msgstr "Zapotrzebowania"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_mts0
@@ -1118,14 +1143,15 @@ msgid "Max Quantity"
 msgstr "Ilość maks."
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement
+#: view:mrp.procurement:0
 msgid "Procurement"
-msgstr "Nabycie"
+msgstr "Zapotrzebowanie"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.product_procurement_wizard
 msgid "Procurement Request"
-msgstr ""
+msgstr "Utwórz zapotrzebowanie"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_price
@@ -1135,7 +1161,7 @@ msgstr "Struktura kosztów produktu"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "Minimum Stock Procure"
-msgstr "Nabycie zapasu minimalnego"
+msgstr "Zapotrzebowanie z zapasu minimalnego"
 
 #. module: mrp
 #: help:res.company,po_lead:0
@@ -1165,10 +1191,11 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Procurement for raw materials."
-msgstr "Nabycie dla materiałów do produkcji."
+msgstr "Zapotrzebowanie na materiały do produkcji."
 
 #. module: mrp
-#: view:mrp.procurement:0 field:mrp.procurement,note:0
+#: view:mrp.procurement:0
+#: field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "Uwaga"
@@ -1176,7 +1203,7 @@ msgstr "Uwaga"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procure Stockable Product"
-msgstr ""
+msgstr "Zapotrzebowanie na produkty rejestrowane"
 
 #. module: mrp
 #: field:mrp.bom,method:0
@@ -1194,32 +1221,39 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr "Zdefiniuj marszrutę, aby opisać kroki produkcyjne."
 
 #. module: mrp
-#: field:mrp.bom,active:0 field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0
+#: field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Aktywne"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
 msgid "Procure Products"
-msgstr "Nabądź produkty"
+msgstr "Zapotrzebowanie na produkty"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0 view:mrp.property:0
+#: view:mrp.bom:0
+#: field:mrp.bom,property_ids:0
+#: view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0
+#: view:mrp.property:0
 msgid "Properties"
 msgstr "Właściwości"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0
+#: field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Planowana data"
 
 #. module: mrp
-#: view:mrp.procurement:0 view:mrp.production:0
+#: view:mrp.procurement:0
+#: view:mrp.production:0
 msgid "Extra Information"
 msgstr "Dodatkowe informacje"
 
@@ -1233,7 +1267,8 @@ msgstr "Definiuj strukturę produktu z produktami ubocznymi lub komponentami."
 msgid ""
 "Procurement is created if the product quantity is lower than the minimum "
 "limit."
-msgstr "Nabycie jest tworzone gdy ilość produktu jest niższa niż minimum."
+msgstr ""
+"Zapotrzebowanie jest tworzone, gdy ilość produktu jest niższa niż minimum."
 
 #. module: mrp
 #: field:mrp.procurement,date_close:0
@@ -1267,14 +1302,15 @@ msgid "Change Product Qty."
 msgstr "Zmień ilość produktu"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0
+#: selection:mrp.production,state:0
 msgid "Done"
 msgstr "Wykonano"
 
 #. module: mrp
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
-msgstr "Ilość nabycia będzie zaokrąglona do tej wielokrotności."
+msgstr "Ilość zapotrzebowania będzie zaokrąglona do tej wielokrotności."
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,logic:0
@@ -1292,7 +1328,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "Central document to procure products"
-msgstr "Centralny dokument do nabycia produktów"
+msgstr "Centralny dokument na zapotrzebowanie produktów"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
@@ -1315,15 +1351,18 @@ msgid "Capacity per Cycle"
 msgstr "Ilość na cykl"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0 rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0
+#: field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0
+#: rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
 #. module: mrp
-#: view:mrp.production:0 field:mrp.production,hour_total:0
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "Suma godzin"
 
@@ -1338,7 +1377,8 @@ msgid "Product BoM Structure"
 msgstr "Struktura Zest. Mat. produktu"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0
+#: field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1350,7 +1390,7 @@ msgid ""
 "Reference of the document that created this procurement.\n"
 "This is automatically completed by Open ERP."
 msgstr ""
-"Oznaczenie dokumentu, który utworzył to nabycie\n"
+"Oznaczenie dokumentu, który utworzył to zapotrzebowanie\n"
 "Jest automatycznie wypełniane przez OpenERP."
 
 #. module: mrp
@@ -1364,14 +1404,16 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr "Typ produktu jest Rejestrowany i metoda nabycia jest Na zapas."
 
 #. module: mrp
-#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0
+#: help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 "Ważność tego Zestawienia materiałowego lub komponentu. Pozostaw puste, jeśli "
 "ma być zawsze ważny."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0
+#: field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "JS produktu"
 
@@ -1383,12 +1425,14 @@ msgstr "JM produktu"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "Centrum robocze"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Bardzo pilne"
 
@@ -1414,8 +1458,8 @@ msgid ""
 "If you encode manually a procurement, you probably want to use a make to "
 "order method."
 msgstr ""
-"Jeśli wprowadziłeś nabycie ręcznie, to prawdopodobnie chcesz zastosowac "
-"metodę 'Na zamówienie'."
+"Jeśli wprowadziłeś zapotrzebowanie ręcznie, to prawdopodobnie chcesz "
+"zastosować metodę 'Na zamówienie'."
 
 #. module: mrp
 #: rml:mrp.production.order:0
@@ -1428,7 +1472,8 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0 view:mrp.production.product.line:0
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "Zaplanowane produkty"
 
@@ -1451,11 +1496,12 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
 msgid "if Product type is Stockable in procurement order"
-msgstr "Jeśli w zamówieniu nabycia produkt jest typu Rejestrowany."
+msgstr "Jeśli w zapotrzebowaniu produkt jest typu Rejestrowany."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0 rml:mrp.production.order:0
+#: view:mrp.production:0
+#: rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr "Centra robocze"
 
@@ -1537,7 +1583,7 @@ msgstr "Kategorie właściwości"
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1
 #: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1
 msgid "Compute Procurements Only"
-msgstr "Oblicz tylko nabycia"
+msgstr "Oblicz tylko zapotrzebowania"
 
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
@@ -1559,7 +1605,7 @@ msgstr "Ważne do"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action11
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11
 msgid "Temporary Procurement Exceptions"
-msgstr "Tymczasowe wyjątki nabycia"
+msgstr "Tymczasowe wyjątki zapotrzebowania"
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
@@ -1603,7 +1649,8 @@ msgstr "Wykorzystanie centrów roboczych"
 msgid ""
 "Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
 "production."
-msgstr "Efektywność produkcji. Współczynnik 0,9 oznacza stratę 10% produkcji."
+msgstr ""
+"Efektywność produkcji. Współczynnik 0,9 oznacza stratę 10% produkcji."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -1665,7 +1712,7 @@ msgstr "Liczba godzin"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action
 msgid "Procurement Orders"
-msgstr "Zamówienia nabycia"
+msgstr "Zapotrzebowania"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property
@@ -1693,7 +1740,8 @@ msgid "plus"
 msgstr "plus"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0
+#: field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "Zest. Mat."
 
@@ -1737,7 +1785,8 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0
+#: view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "Wersje Zest. Mat."
 
@@ -1747,19 +1796,21 @@ msgid "Retry"
 msgstr "Powtórz"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0
+#: selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Projekt"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0
+#: selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Normalne"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
 msgid "When any procuere products, it comes into the prpcurement orders"
-msgstr "Wszystkie nabycia produktów stają się zamówieniami nabycia"
+msgstr "Kiedy produkt jest potrzebny, to powstaje zapotrzebowanie"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
@@ -1770,7 +1821,7 @@ msgstr "Zamówienia produkcji do rozpoczęcia"
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Reason"
-msgstr "Powód nabycia"
+msgstr "Powód zapotrzebowania"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -1798,7 +1849,7 @@ msgstr "Zestawienia materiałowe"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procureserviceproduct0
 msgid "In procurement order, if product type is service"
-msgstr "W zamówieniach nabycia, jeśli typ produktu jest Usługa"
+msgstr "W zapotrzebowaniach, jeśli typ produktu jest Usługa"
 
 #. module: mrp
 #: selection:mrp.procurement,procure_method:0
@@ -1806,8 +1857,11 @@ msgid "from stock"
 msgstr "z zapasu"
 
 #. module: mrp
-#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
-#: view:mrp.routing:0 view:mrp.routing.workcenter:0
+#: view:mrp.bom:0
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+#: view:mrp.routing:0
+#: view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Informacje ogólne"
 
@@ -1860,10 +1914,14 @@ msgid "Change Product Qty"
 msgstr "Zmień ilość produktu"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0 view:mrp.property:0
-#: field:mrp.property,description:0 field:mrp.property.group,description:0
-#: view:mrp.routing:0 field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0
+#: view:mrp.property:0
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+#: view:mrp.routing:0
+#: field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0
+#: view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Opis"
@@ -1882,7 +1940,7 @@ msgstr "Produkowanie"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action3
 msgid "Unscheduled procurements"
-msgstr "Nabycia nie zaplanowane"
+msgstr "Zapotrzebowania nie zaplanowane"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action
@@ -1903,7 +1961,7 @@ msgstr "Czas czyszczenia w godzinach"
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Details"
-msgstr "Szczegóły nabycia"
+msgstr "Szczegóły zapotrzebowania"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1923,7 +1981,8 @@ msgid "On Stock"
 msgstr "Na zapas"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0
+#: rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1981,4 +2040,9 @@ msgstr "Tygodniowe odchylenie wartości zapasów"
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
 msgid "Stock value variation"
-msgstr "Odchylenie wartości zapasów"
+msgstr "Zmiany wartości zapasów"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next production orders"
+msgstr "Następne zamówienie produkcji"
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 13ded3a9694..4f33b0c1558 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -48,10 +48,10 @@ class mrp_workcenter(osv.osv):
         'time_cycle': fields.float('Time for 1 cycle (hour)', help="Time in hours for doing one cycle."),
         'time_start': fields.float('Time before prod.', help="Time in hours for the setup."),
         'time_stop': fields.float('Time after prod.', help="Time in hours for the cleaning."),
-        'costs_hour': fields.float('Cost per hour'),
+        'costs_hour': fields.float('Cost per hour', help="Specify Cost of Workcenter per hour."),
         'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','<>','view')],
             help="Complete this only if you want automatic analytic accounting entries on production orders."),
-        'costs_cycle': fields.float('Cost per cycle'),
+        'costs_cycle': fields.float('Cost per cycle', help="Specify Cost of Workcenter per cycle."),
         'costs_cycle_account_id': fields.many2one('account.analytic.account', 'Cycle Account', domain=[('type','<>','view')],
             help="Complete this only if you want automatic analytic accounting entries on production orders."),
         'costs_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
@@ -60,7 +60,8 @@ class mrp_workcenter(osv.osv):
        'resource_id': fields.many2one('resource.resource','Resource',ondelete='cascade'),
     }
     _defaults = {
-        'capacity_per_cycle': lambda *a: 1.0,
+        'capacity_per_cycle': 1.0,
+        'resource_type': 'material',
      }
 mrp_workcenter()
 
@@ -201,7 +202,6 @@ class mrp_bom(osv.osv):
         'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production planning."),
         'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
         'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
-        'revision_type': fields.selection([('numeric','numeric indices'),('alpha','alphabetical indices')], 'Index type'),
         'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
@@ -209,7 +209,7 @@ class mrp_bom(osv.osv):
         'active': lambda *a: 1,
         'product_efficiency': lambda *a: 1.0,
         'product_qty': lambda *a: 1.0,
-        'product_rounding': lambda *a: 1.0,
+        'product_rounding': lambda *a: 0.0,
         'type': lambda *a: 'normal',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.bom', context=c),
     }
@@ -270,11 +270,11 @@ class mrp_bom(osv.osv):
                 max_prop = prop
         return result
 
-    def _bom_explode(self, cr, uid, bom, factor, properties, addthis=False, level=0):
+    def _bom_explode(self, cr, uid, bom, factor, properties=[], addthis=False, level=0):
         """ Finds Products and Workcenters for related BoM for manufacturing order.
         @param bom: BoM of particular product.
         @param factor: Factor of product UoM.
-        @param properties: A dictionary for contextual values.
+        @param properties: A List of properties Ids.
         @param addthis: If BoM found then True else False.
         @param level: Depth level to find BoM lines starts from 10.
         @return: result: List of dictionaries containing product details.
@@ -326,25 +326,6 @@ class mrp_bom(osv.osv):
                 result2 = result2 + res[1]
         return result, result2
 
-    def set_indices(self, cr, uid, ids, context={}):
-        """ Sets Indices.
-        @return: True
-        """
-        if not ids or (ids and not ids[0]):
-            return True
-        res = self.read(cr, uid, ids, ['revision_ids', 'revision_type'])
-        rev_ids = res[0]['revision_ids']
-        idx = 1
-        new_idx = []
-        bom_rev_obj = self.pool.get('mrp.bom.revision')
-        for rev_id in rev_ids:
-            if res[0]['revision_type'] == 'numeric':
-                bom_rev_obj.write(cr, uid, [rev_id], {'indice': idx})
-            else:
-                bom_rev_obj.write(cr, uid, [rev_id], {'indice': "%c" %(idx+96,)})
-            idx += 1
-        return True
-
 mrp_bom()
 
 class mrp_bom_revision(osv.osv):
@@ -470,27 +451,27 @@ class mrp_production(osv.osv):
         'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', required=True,
             help="Location where the system will stock the finished products."),
 
-        'date_planned_end': fields.function(_production_date_end, method=True, type='date', string='Scheduled End'),
+        'date_planned_end': fields.function(_production_date_end, method=True, type='date', string='Scheduled End Date'),
         'date_planned_date': fields.function(_production_date, method=True, type='date', string='Scheduled Date'),
         'date_planned': fields.datetime('Scheduled date', required=True, select=1),
         'date_start': fields.datetime('Start Date'),
         'date_finnished': fields.datetime('End Date'),
 
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
-        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan futur loads on workcenters based on production plannification."),
+        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."),
 
         'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True,
             help="This is the internal picking list that brings the finished product to the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
-        'move_lines': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consumme', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
-        'move_lines2': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consummed Products', domain=[('state','in', ('done', 'cancel'))], readonly=True),
+        'move_lines': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
+        'move_lines2': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products', domain=[('state','in', ('done', 'cancel'))], readonly=True),
         'move_created_ids': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
         'move_created_ids2': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','in', ('done', 'cancel'))], readonly=True),
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'),
         'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
                                     help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Picking Exception\'.\
-                                    \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production get started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
+                                    \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production gets started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
         'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
         'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
 
@@ -553,33 +534,46 @@ class mrp_production(osv.osv):
             return {'value': {'location_dest_id': src}}
         return {}
 
-    def product_id_change(self, cr, uid, ids, product, context=None):
+    def product_id_change(self, cr, uid, ids, product_id, context=None):
         """ Finds UoM of changed product.
-        @param product: Id of changed product.
+        @param product_id: Id of changed product.
         @return: Dictionary of values.
         """
-        if not product:
+        if not product_id:
             return {'value': {
                 'product_uom': False,
-                'bom_id': False
+                'bom_id': False,
+                'routing_id': False
             }}
-        res = self.pool.get('product.product').browse(cr, uid, product, context=context)
+        bom_obj = self.pool.get('mrp.bom')
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        bom_id = bom_obj._bom_find(cr, uid, product.id, product.uom_id and product.uom_id.id, [])
+        routing_id = False
+        if bom_id:
+            bom_point = bom_obj.browse(cr, uid, bom_id, context=context)
+            routing_id = bom_point.routing_id.id or False
         result = {
-            'product_uom': res.uom_id and res.uom_id.id or False,
-            'bom_id': res.bom_ids and res.bom_ids[0].id or False
+            'product_uom': product.uom_id and product.uom_id.id or False,
+            'bom_id': bom_id,
+            'routing_id': routing_id
         }
         return {'value': result}
 
-    def bom_id_change(self, cr, uid, ids, product):
+    def bom_id_change(self, cr, uid, ids, bom_id, context=None):
         """ Finds routing for changed BoM.
         @param product: Id of product.
         @return: Dictionary of values.
         """
-        if not product:
-            return {}
-        res = self.pool.get('mrp.bom').read(cr, uid, [product], ['routing_id'])[0]
-        routing_id = res['routing_id'] and res['routing_id'][0]
-        result = {'routing_id': routing_id}
+        if not bom_id:
+            return {'value': {
+                'routing_id': False
+            }}
+        bom_pool = self.pool.get('mrp.bom')
+        bom_point = bom_pool.browse(cr, uid, bom_id, context=context)
+        routing_id = bom_point.routing_id.id or False
+        result = {
+            'routing_id': routing_id
+        }
         return {'value': result}
 
     def action_picking_except(self, cr, uid, ids):
@@ -655,13 +649,11 @@ class mrp_production(osv.osv):
                 move_obj.write(cr, uid, [production.move_prod_id.id],
                         {'location_id': production.location_dest_id.id})
 
-            message = ("%s %s %s %s %s %s") % (
-                    _('Manufacturing Order '),
-                    name,
-                    _("scheduled the"),
-                    datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d'),
-                    _("for"),
-                    production.product_id.name)
+            message = ("Manufacturing Order '%s' for %s %s is Ready to produce.") % (
+                                    name,
+                                    production.product_qty, 
+                                    production.product_id.name, 
+                                   )
             self.log(cr, uid, production_id, message)
         return True
 
@@ -687,7 +679,7 @@ class mrp_production(osv.osv):
         return res
 
     def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None):
-        """ To produce final product base on production mode (consume/consume&produce).
+        """ To produce final product based on production mode (consume/consume&produce).
         If Production mode is consume, all stock move lines of raw materials will be done/consumed.
         If Production mode is consume & produce, all stock move lines of raw materials will be done/consumed
         and stock move lines of final product will be also done/produced.
@@ -760,7 +752,8 @@ class mrp_production(osv.osv):
         
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, 'mrp.production', production_id, 'button_produce_done', cr)
-        message = _('Manufacturing order ') + " '" + production.name + "' "+ _("is finished.")
+        for (id, name) in self.pool.get('product.product').name_get(cr, uid, [production.product_id.id]):
+            message = str(production_qty) + ' ' + production.product_uom.name +" '" + name + _("' have been manufactured for ") + production.name
         self.log(cr, uid, production_id, message)
         return True
 
@@ -930,7 +923,16 @@ class mrp_production(osv.osv):
                 proc_ids.append(proc_id)                
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
             self.write(cr, uid, [production.id], {'picking_id': picking_id, 'move_lines': [(6,0,moves)], 'state':'confirmed'})
-            message = _('Manufacturing order ') + " '" + production.name + "' "+ _("is confirmed.")
+            message = ("%s '%s' %s %s %s %s %s %s.") % (
+                                    _('Manufacturing Order'), 
+                                    production.name,
+                                    _('for'), 
+                                    production.product_qty, 
+                                    production.product_id.name, 
+                                    _('scheduled for date '), 
+                                    datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d'),
+                                    _('is waiting') 
+                                   )
             self.log(cr, uid, production.id, message)
         return picking_id
 
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index c3929df10af..73fc81af73d 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -16,7 +16,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">After having installed the core manufacturing application, you can extend it with a few more depending on the needs of your organization</attribute>
+            <attribute name="string">After having installed the core manufacturing application, you can extend it depending on the needs of your MRP's organization</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
       			<attribute name='string'></attribute>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 1bd0724a003..ca003b33daa 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -155,10 +155,10 @@
                             <group col="4" colspan="4">
                                 <field name="capacity_per_cycle"/>
                                 <newline/>
-                                <field name="time_cycle"/>
+                                <field name="time_cycle" widget="float_time"/>
                                 <field name="time_efficiency"/>
-                                <field name="time_start"/>
-                                <field name="time_stop"/>
+                                <field name="time_start" widget="float_time"/>
+                                <field name="time_stop" widget="float_time"/>
                             </group>
                         </page>
                         <page string="Analytic Accounting" groups="base.group_extended">
@@ -204,6 +204,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_workcenter_tree_view"/>
             <field name="search_view_id" ref="view_mrp_workcenter_search"/>
+            <field name="help">Work Centers are units of manufacture consisting of one or several people and/or machines that can be considered as a unit for the purposes of forecasting capacity and planning.</field>
         </record>
 
         <!--
@@ -235,7 +236,7 @@
                     <field name="sequence" select="1"/>
                     <field name="workcenter_id" select="1"/>
                     <field name="cycle_nbr"/>
-                    <field name="hour_nbr"/>
+                    <field name="hour_nbr" widget="float_time"/>
                     <separator colspan="4" string="Description"/>
                     <field colspan="4" name="note" nolabel="1"/>
                 </form>
@@ -278,6 +279,7 @@
             <field name="res_model">mrp.routing</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_routing_tree_view"/>
+            <field name="help">Routings define the assembly operations to be done in work centers for manufacturing a certain product. They are usually attached to bills of materials which will define the assembly of products required for manufacture or for finished products.</field>
         </record>
  <!--       <menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="mrp.menu_mrp_bom" groups="base.group_extended"
                   sequence="100" />-->
@@ -299,8 +301,8 @@
                         <field name="name" select="1"/>
                         <field name="code" select="1" string="Reference" groups="base.group_extended"/>
                         <newline/>
-                        <field name="product_uom"/>
                         <field name="product_qty"/>
+                        <field name="product_uom"/>
                         <field name="routing_id" groups="base.group_extended"/>
                         <newline/>
                         <field name="product_uos" groups="product.group_uos"/>
@@ -314,8 +316,8 @@
                             <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list">
                                 <tree string="Components" editable="bottom">
                                     <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-                                    <field name="product_uom"/>
                                     <field name="product_qty"/>
+                                    <field name="product_uom"/>
                                     <field name="name" invisible="1"/>
                                     <field name="date_start"/>
                                     <field name="date_stop"/>
@@ -398,6 +400,7 @@
             <field name="view_type">form</field>
             <field name="domain">[('bom_id','=',False)]</field>
             <field name="search_view_id" ref="view_mrp_bom_filter"/>
+            <field name="help">Master Bills of Materials are documents that describe the list of raw materials used to make a finished product. You can generate documents for a product manufacturing (defining each manufacturing step) or you could define a single multi-level bill of materials.</field>
         </record>
         <record id="mrp_bom_form_action2" model="ir.actions.act_window">
             <field name="name">Bill of Material Components</field>
@@ -405,6 +408,7 @@
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
             <field name="domain">[('bom_id','!=',False)]</field>
+            <field name="help">Bills of materials Components are components and sub-product used to create master bills of materials.</field>
         </record>
 
         <!-- BOM menus -->
@@ -496,7 +500,7 @@
             <field name="model">mrp.production</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
+                <tree colors="blue:state in ('draft','confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty" sum="Total Qty"/>
@@ -590,7 +594,7 @@
 
                             <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
-                                <tree string="Products to Consume">
+                                <tree colors="blue:state in ('draft');black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
                                     <field name="product_uom"  string="UOM"/>
@@ -609,7 +613,7 @@
 
                             <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                                        widget="one2many_list" mode="tree,form" height="275">
-                                   <tree string="Consumed Products" editable="bottom" colors="red:scraped==True">
+                                   <tree colors="red:scraped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
                                     <field name="product_uom" readonly="1" string="UOM"/>
@@ -659,7 +663,7 @@
 
                             <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                                        widget="one2many_list" mode="tree,form" height="275">
-                                   <tree string="Finished Products" editable="bottom" colors="red:scraped==True">
+                                   <tree colors="red:scraped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
                                     <field name="product_uom" readonly="1" string="UOM"/>
@@ -762,6 +766,7 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
             <field name="context">{'search_default_Current':1}</field>
+            <field name="help">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) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, Open ERP becomes capable of automatically deciding on the manufacturing route depending on the needs of the company.</field>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" sequence="1"/>
 
@@ -772,6 +777,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('ready','confirmed','in_production'))]</field>
+            <field name="help">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, Open ERP becomes capable of automatically deciding on the manufacturing route depending on the needs of the company.</field>
         </record>
 
         <record id="mrp_production_action2" model="ir.actions.act_window">
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
deleted file mode 100644
index f7bfdcd7395..00000000000
--- a/addons/mrp/mrp_wizard.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-
-    </data>
-</openerp>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 9c4d4924924..7617c8f55e4 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -10,7 +10,7 @@
             <field name="model">mrp.production.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-               <tree string="Production">
+               <tree colors="blue:state in ('draft');black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('done','cancel') " string="Production">
                       <field name="date_planned"/>
                       <field name="bom_id" invisible="1"/>
                       <field name="product_id" invisible="1"/>
@@ -86,7 +86,7 @@
                     	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                    </group>
                     <newline/>
-	                <group expand="0" string="Extended options..." groups="base.group_extended">
+	                <group expand="0" string="Extended Filters..." groups="base.group_extended">
 	                    <filter icon="terp-emblem-important" string="Picking Exception" domain="[('state','=','picking_except')]"/>
 	                    <filter icon="terp-gtk-media-pause" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
 	                    <filter icon="terp-camera_test" string="Ready to Produce" domain="[('state','=','ready')]"/>
@@ -109,8 +109,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_mrp_production_order_tree"/>
             <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
-          <field name="context">{'search_default_Product': 1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
-
+            <field name="context">{'search_default_Product': 1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
        	<record model="ir.actions.act_window.view" id="action_report_mrp_production_order_tree">
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index cf66f93f0e4..5f28f2ce6f4 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -49,6 +49,7 @@
             <field name="res_model">report.workcenter.load</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="help">Work Center Load is a projection of load in a work center given a period. The load is express in hour and cycle (for machines).</field>
         </record>
         <menuitem id="next_id_77" name="Reporting"
             parent="base.menu_mrp_root" sequence="49"/>
@@ -100,6 +101,7 @@
             <field name="res_model">report.mrp.inout</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="help">Weekly Stock Value Variation enables you to track stock value evolution as a result of manufacturing activities (consumption of raw materials, production of finished goods, added accounting value of stock by the creation of value following the transformation of products).</field>
         </record>
         <menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" parent="next_id_77"/>
 
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 3db5396d444..5ed1af444f1 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -135,14 +135,6 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table7">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
     <blockTableStyle id="Table10">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -186,25 +178,18 @@
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-   <section>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]] </para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <para style="terp_header">Production Order N° : [[ o.name ]]</para>
-    <para style="terp_default_space">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="193.0,106.0,96.0,132.0" style="Table3">
+    <blockTable colWidths="193.0,83.0,122.0,129.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Product </para>
@@ -220,7 +205,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="193.0,106.0,96.0,132.0" style="Table5">
+    <blockTable colWidths="193.0,83.0,122.0,129.0" style="Table5">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ o.product_id.code ]] [[ o.product_id.name ]]</para>
@@ -236,16 +221,16 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_space">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="118.0,147.0,132.0,131.0" repeatRows="1" style="Table1">
+    <blockTable colWidths="193.0,83.0,122.0,129.0" repeatRows="1" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Printing date</para>
+          <para style="terp_tblheader_General_Centre">Planned Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Planned Date </para>
+          <para style="terp_tblheader_General_Centre">Printing date</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Partner Ref</para>
@@ -256,37 +241,37 @@
       </tr>
     </blockTable>
     <section>
-      <blockTable colWidths="118.0,147.0,132.0,131.0" style="Table2">
+      <blockTable colWidths="193.0,83.0,122.0,129.0" style="Table2">
         <tr>
-          <td>
-            <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
-          </td>
           <td>
             <para style="terp_default_Centre_8">[[ formatLang(o.date_planned, date_time = True) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_8">[[ 'sale_ref' in o._columns.keys() and o.sale_ref or removeParentNode('para') ]]</para>
+            <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_8">[[ 'sale_name' in o._columns.keys() and o.sale_name or removeParentNode('para') ]]</para>
+            <para style="terp_default_Centre_8">[[ ('sale_ref' in o._columns.keys() and o.sale_ref) or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_8">[[ ('sale_name' in o._columns.keys() and o.sale_name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_Bold_8">Work Orders</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="81.0,155.0,125.0,84.0,83.0" style="Table6">
+    <para style="terp_default_Bold_8">Work Orders <font face="Helvetica" size="10.0">[[ o.workcenter_lines ==[] and removeParentNode('para')]]</font></para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="74.0,203.0,121.0,66.0,64.0" style="Table6">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Sequence</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Name </para>
+          <para style="terp_tblheader_Details_Centre">Name <font face="Helvetica" size="10.0">[[ o.workcenter_lines ==[] and removeParentNode('blockTable')]]</font></para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">WorkCenter</para>
@@ -301,7 +286,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.workcenter_lines,'line2') ]]</para>
-      <blockTable colWidths="81.0,155.0,125.0,84.0,83.0" style="Table4">
+      <blockTable colWidths="74.0,203.0,121.0,66.0,64.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_Centre_8">[[ line2.sequence ]]</para>
@@ -324,17 +309,14 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_space">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <para style="terp_default_Bold_9">Bill Of Material </para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <section>
-    <para style="terp_default_Bold_9">Products to Consume</para>
-    <blockTable colWidths="235.0,82.0,107.0,104.0" style="Table8">
-	  <para> <font color="white"> [[ o.move_lines ==[] and removeParentNode('section')]]</font></para>    
+    <blockTable colWidths="250.0,66.0,107.0,104.0" style="Table8">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product </para>
@@ -350,76 +332,58 @@
         </td>
       </tr>
     </blockTable>
-    </section>
     <section>
-      <blockTable colWidths="235.0,47.0,34.0,108.0,104.0" style="Table9">
-       <para style="terp_default_8">[[ repeatIn(o.move_lines,'line') ]]</para>
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ line.product_id.code ]] [[ line.product_id.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang( line.product_qty) ]] </para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[line.product_uom.name]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_9">[[ line.location_id.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_9">[[ line.location_dest_id.name ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      </section>
-	  <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
-    <section>
-    <para style="terp_default_Bold_9">Consumed Products</para>
-	   
-      <blockTable colWidths="235.0,82.0,107.0,104.0" style="Table7">
-      <para> <font color="white"> [[ o.move_lines2 ==[] and removeParentNode('section')]]</font></para>
-        <tr>
-          <td>
-            <para style="terp_tblheader_Details">Product </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Centre">Quantity</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Centre">Source Location</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Centre">Destination Location</para>
-          </td>
-        </tr>
-      </blockTable>
-      </section>
+      <para style="terp_default_Bold_9">Products to Consume [[ o.move_lines ==[] and removeParentNode('section')]]</para>
       <section>
-      <blockTable colWidths="235.0,47.0,34.0,108.0,104.0" style="Table10">
-	  <para style="terp_default_8">[[ repeatIn(o.move_lines2,'line2') ]]</para>      
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ line2.product_id.code ]] [[ line2.product_id.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang( line2.product_qty) ]] </para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[line2.product_uom.name]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_9">[[ line2.location_id.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_9">[[ line2.location_dest_id.name ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    
+        <para style="terp_default_8">[[ repeatIn(o.move_lines,'line') ]]</para>
+        <blockTable colWidths="250.0,42.0,23.0,109.0,104.0" style="Table9">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ line.product_id.code ]] [[ line.product_id.name ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang( line.product_qty) ]] </para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[line.product_uom.name]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ line.location_id.name ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ line.location_dest_id.name ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+    </section>
+    <section>
+      <para style="terp_default_Bold_9">Consumed Products [[ o.move_lines2 ==[] and removeParentNode('section')]]</para>
+      <section>
+        <para style="terp_default_8">[[ repeatIn(o.move_lines2,'line2') ]]</para>
+        <blockTable colWidths="251.0,41.0,23.0,109.0,104.0" style="Table10">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ line2.product_id.code ]] [[ line2.product_id.name ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang( line2.product_qty) ]] </para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[line2.product_uom.name]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ line2.location_id.name ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ line2.location_dest_id.name ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
     </section>
-     </section>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 0a6a21de971..ca8e9b9c0b7 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -31,75 +31,68 @@ from tools.translate import _
 class report_custom(report_rml):
     def create_xml(self, cr, uid, ids, datas, context={}):
         number = (datas.get('form', False) and datas['form']['number']) or 1
-
-        def process_bom(bom, currency_id):
+        pool = pooler.get_pool(cr.dbname)
+        product_pool = pool.get('product.product')
+        product_uom_pool = pool.get('product.uom')
+        supplier_info_pool = pool.get('product.supplierinfo')
+        workcenter_pool = pool.get('mrp.workcenter')
+        user_pool = pool.get('res.users')
+        bom_pool = pool.get('mrp.bom')
+        def process_bom(bom, currency_id, factor=1):
             xml = '<row>'
             sum = 0
             sum_strd = 0
-            prod = pooler.get_pool(cr.dbname).get('product.product').browse(cr, uid, bom['product_id'])
+            prod = product_pool.browse(cr, uid, bom['product_id'])
 
             prod_name = bom['name']
-            prod_qtty = bom['product_qty']
-            prod_uom = prod.uom_id.name
+            prod_qtty = factor * bom['product_qty']
+            product_uom = product_uom_pool.browse(cr, uid, bom['product_uom'], context=context)
             level = 1
-            main_sp_price = ''
-            main_sp_name = ''
-            main_strd_price = ''
-            main_strd_price = ''
-            if prod.seller_ids and prod.seller_ids[0] :
-                main_sp_name = '<b>' + prod.seller_ids[0].name.name + '</b>\r\n'
-                pricelist_id = prod.seller_ids[0].name.property_product_pricelist_purchase.id
-                if pricelist_id:
-                    pricelist_obj = pooler.get_pool(cr.dbname).get('product.pricelist')
-                    price = pricelist_obj.price_get(cr,uid,[pricelist_id], prod.id, number*prod_qtty or 1.0).setdefault(pricelist_id, 0)
-                    price = pooler.get_pool(cr.dbname).get('res.currency').compute(cr, uid, pricelist_obj.browse(cr, uid, pricelist_id).currency_id.id, currency_id, price)
-                else:
-                    price = 0
-                main_sp_price = '%.2f' % price + '\r\n'
+            main_sp_price, main_sp_name , main_strd_price = '','',''
+            sellers, sellers_price = '',''
+
+            if prod.seller_id:
+                main_sp_name = "<b>%s</b>\r\n" %(prod.seller_id.name)
+                price = supplier_info_pool.price_get(cr, uid, prod.seller_id.id, prod.id, number*prod_qtty)[prod.seller_id.id]
+                price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, price, to_uom_id=product_uom.id)
+                main_sp_price = '<b>%s</b>\r\n' %(str(price))
                 sum += prod_qtty*price
+            std_price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, prod.standard_price, to_uom_id=product_uom.id)
+            main_strd_price = str(std_price) + '\r\n'
+            sum_strd = prod_qtty*std_price
 
-            main_strd_price = '%.2f' % prod.standard_price + '\r\n'
-            sum_strd = prod_qtty*prod.standard_price
-
-            sellers = ''
-            sellers_price = ''
             for seller_id in prod.seller_ids:
                 sellers +=  '- <i>'+ seller_id.name.name +'</i>\r\n'
-                pricelist_id = seller_id.name.property_product_pricelist_purchase.id
-                if pricelist_id:
-                    pricelist_obj = pooler.get_pool(cr.dbname).get('product.pricelist')
-                    price = pricelist_obj.price_get(cr,uid,[pricelist_id], prod.id, number*prod_qtty or 1.0).setdefault(pricelist_id, 0)
-                    price = pooler.get_pool(cr.dbname).get('res.currency').compute(cr, uid, pricelist_obj.browse(cr, uid, pricelist_id).currency_id.id, currency_id, price)
-                else:
-                    price = 0
-                sellers_price += '%.2f' % price + '\r\n'
+                price = supplier_info_pool.price_get(cr, uid, seller_id.name.id, prod.id, number*prod_qtty)[seller_id.name.id]
+                price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, price, to_uom_id=product_uom.id)
+                sellers_price += '<i>' + str(price) + '</i>\r\n'
 
             xml += "<col para='yes'>" + prod_name + '</col>'
-            xml += "<col para='no'>" + main_sp_name +  sellers + '</col>'
+            xml += "<col para='yes'>" + main_sp_name +  sellers + '</col>'
             xml += "<col para='yes'>" + str(prod_qtty) + '</col>'
-            xml += "<col para='yes'>" + prod_uom + '</col>'
+            xml += "<col para='yes'>" + product_uom.name + '</col>'
             xml += "<col para='yes'>" + main_strd_price + '</col>'
-            xml += "<col para='no'>" + main_sp_price +  sellers_price + '</col>'
+            xml += "<col para='yes'>" + main_sp_price +  sellers_price + '</col>'
 
 
             xml += '</row>'
             return xml, sum, sum_strd
 
         def process_workcenter(wrk):
+            workcenter = workcenter_pool.browse(cr, uid, wrk['workcenter_id'])
+            cost_cycle = wrk['cycle']*workcenter.costs_cycle
+            cost_hour = wrk['hour']*workcenter.costs_hour
+            total = cost_cycle + cost_hour
             xml = '<row>'
-
-            workcenter = pooler.get_pool(cr.dbname).get('mrp.workcenter').browse(cr, uid, wrk['workcenter_id'])
-
-            xml += "<col para='yes'>" + wrk['name'] + '</col>'
-            xml += "<col para='yes'>" +  '</col>'
-            xml += "<col para='no'>" + '</col>'
+            xml += "<col para='yes'>" + workcenter.name + '</col>'
             xml += "<col/>"
-            xml += "<col para='no'>" + str(wrk['cycle']*workcenter.costs_cycle) + '</col>'
-            xml += "<col para='yes'>" + str(wrk['hour']*workcenter.costs_hour) + '</col>'
-
-
+            xml += "<col/>"
+            xml += "<col para='yes'>" + str(cost_cycle) + '</col>'
+            xml += "<col para='yes'>" + str(cost_hour) + '</col>'
+            xml += "<col para='yes'>" + str(cost_hour + cost_cycle) + '</col>'
             xml += '</row>'
-            return xml, wrk['cycle']*workcenter.costs_cycle+wrk['hour']*workcenter.costs_hour
+            
+            return xml, total
 
 
         xml = ''
@@ -115,30 +108,20 @@ class report_custom(report_rml):
             <report-footer>Generated by Open ERP</report-footer>
         </config>
         """
-        header = """
-            <header>
-            <field>%s</field>
-            <field>%s</field>
-            <field>%s</field>
-            <field>%s</field>
-            <field>%s</field>
-            <field>%s</field>
-            </header>
-            """ % (_('Product name'), _('Product supplier'), _('Product quantity'), _('Product uom'), _('Product Standard Price'), _('Unit Product Price'))
+        
         workcenter_header = """
             <lines style='header'>
                 <row>
                     <col>%s</col>
                     <col/>
                     <col/>
-                    <col/>
+                    <col>%s</col>
                     <col>%s</col>
                     <col>%s</col>
                 </row>
             </lines>
-        """ % (_('Work Center name'), _('Cycles Cost'), _('Total hourly costs'))
+        """ % (_('Work Center name'), _('Cycles Cost'), _('Hourly Cost'),_('Work Cost'))
         prod_header = """
-            <lines style='header'>
                 <row>
                     <col para='yes'>%s</col>
                     <col para='yes'>%s</col>
@@ -147,32 +130,62 @@ class report_custom(report_rml):
                     <col para='yes'>%s</col>
                     <col para='yes'>%s</col>
                 </row>
-            </lines>
-        """ % (_('Product name'), _('Product supplier'), _('Product Quantity'), _('Product uom'), _('Product Standard Price'), _('Unit Product Price'))
+        """ % (_('Componet'), _('Componet suppliers'), _('Quantity'), _('Uom'), _('Cost Unit Price per Uom'), _('Supplier Unit Price per Uom'))
 
-        company_currency = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid).company_id.currency_id.id
-        first = True
-        for prod_id in ids:
-            bom_ids = pooler.get_pool(cr.dbname).get('mrp.bom').search(cr, uid, [('product_id','=',prod_id)])
-            prod = pooler.get_pool(cr.dbname).get('product.product').browse(cr, uid, prod_id)
-
-            for bom_id in bom_ids:
-                bom = pooler.get_pool(cr.dbname).get('mrp.bom').browse(cr, uid, bom_id)
-
-                sub_boms = pooler.get_pool(cr.dbname).get('mrp.bom')._bom_explode(cr, uid, bom, number, [])
+        company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id.id
+        for product in product_pool.browse(cr, uid, ids, context=context):
+            bom_id = bom_pool._bom_find(cr, uid, product.id, product.uom_id.id)
+            title = "<title>%s</title>" %(_("Cost Structure"))
+            title += "<title>%s</title>" %product.name
+            xml += "<lines style='header'>" + title + prod_header + "</lines>"            
+            if not bom_id:
+                total_strd = number * product.standard_price
+                total = number * product_pool.price_get(cr, uid, [product.id], 'standard_price')[product.id]
+                xml += """<lines style='lines'><row>
+                    <col para='yes'>-</col>
+                    <col para='yes'>-</col>
+                    <col para='yes'>-</col>
+                    <col para='yes'>-</col>
+                    <col para='yes'>-</col>
+                    <col para='yes'>-</col>
+                    </row></lines>"""
+                xml += """<lines style='total'> <row>
+                    <col>%s %s %s %s : </col>
+                    <col/>
+                    <col/>
+                    <col/>
+                    <col>%s</col>
+                    <col>%s</col>
+                    </row></lines>'"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, str(total_strd), str(total))
+            else:
+                bom = bom_pool.browse(cr, uid, bom_id, context=context)
+                factor = number * product.uom_id.factor / bom.product_uom.factor
+                sub_boms = bom_pool._bom_explode(cr, uid, bom, factor / bom.product_qty)
                 total = 0
                 total_strd = 0
-                parent_bom = {'product_qty': bom.product_qty, 'name': bom.product_id.name, 'product_uom': bom.product_id.uom_id.factor, 'product_id': bom.product_id.id}
+                parent_bom = {
+                        'product_qty': bom.product_qty, 
+                        'name': bom.product_id.name, 
+                        'product_uom': bom.product_uom.id, 
+                        'product_id': bom.product_id.id
+                }
                 xml_tmp = ''
                 for sub_bom in (sub_boms and sub_boms[0]) or [parent_bom]:
                     txt, sum, sum_strd = process_bom(sub_bom, company_currency)
                     xml_tmp +=  txt
                     total += sum
                     total_strd += sum_strd
-                if not first:
-                    xml += prod_header
+                                
                 xml += "<lines style='lines'>" + xml_tmp + '</lines>'
-                xml += "<lines style='sub_total'><row><col>%s : </col><col>(" % (_('SUBTOTAL')) + str(number) + " %s)</col><col/><col/><col>" % (_('products')) + '%.2f' % total_strd + '</col><col>' + '%.2f' % total  + '</col></row></lines>'
+                xml += """<lines style='sub_total'> <row>
+                    <col>%s %s %s %s : </col>
+                    <col/>
+                    <col/>
+                    <col/>
+                    <col>%s</col>
+                    <col>%s</col>
+                    </row></lines>'"""%(_('Cost'), _('of'), str(number), product.uom_id.name, str(total_strd), str(total))
+
                 total2 = 0
                 xml_tmp = ''
                 for wrk in (sub_boms and sub_boms[1]):
@@ -182,13 +195,24 @@ class report_custom(report_rml):
                 if xml_tmp:
                     xml += workcenter_header
                     xml += "<lines style='lines'>" + xml_tmp + '</lines>'
-                    xml += "<lines style='sub_total'><row><col>%s : </col><col>(" % (_('SUBTOTAL')) + str(number) + " %s)</col><col/><col/><col/><col>" % (_('products')) + '%.2f' % total2 + '</col></row></lines>'
-                xml += "<lines style='total'><row><col>%s : </col><col>(" % (_('TOTAL')) + str(number) + " %s)</col><col/><col/><col>" % (_('products')) + '%.2f' % (total_strd+total2) + "</col><col>" + '%.2f' % (total+total2) + '</col></row></lines>'
-
-                first = False
-
-        xml = '<?xml version="1.0" ?><report>' + config_start + '<report-header>%s\n\r' % (_('Product Cost Structure')) + prod.name  + '</report-header>'+ config_stop +  header + xml + '</report>'
+                    xml += """<lines style='sub_total'> <row>
+                    <col>%s %s %s %s : </col>
+                    <col/>
+                    <col/>
+                    <col/>
+                    <col/>
+                    <col>%s</col>
+                    </row></lines>'"""%(_('Work Cost'), _('of'), str(number), product.uom_id.name, str(total2))
+                xml += """<lines style='total'> <row>
+                    <col>%s %s %s %s : </col>
+                    <col/>
+                    <col/>
+                    <col/>
+                    <col>%s</col>
+                    <col>%s</col>
+                    </row></lines>'"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, str(total_strd+total2), str(total+total2))
 
+        xml = '<?xml version="1.0" ?><report>' + config_start + config_stop + xml + '</report>'
         return xml
 
 report_custom('report.product.price', 'product.product', '', 'addons/mrp/report/price.xsl')
diff --git a/addons/mrp/report/price.xsl b/addons/mrp/report/price.xsl
index 9f7dcf92fd8..10e088629e0 100644
--- a/addons/mrp/report/price.xsl
+++ b/addons/mrp/report/price.xsl
@@ -43,13 +43,6 @@
 	
 	<xsl:template match="report">
 		<xsl:apply-templates select="config"/>
-		<blockTable style="header">
-		 <xsl:attribute name="colWidths">
-			 <xsl:value-of select="./config/tableSize"/>
-		 </xsl:attribute>
-		
-		<xsl:apply-templates select="header"/>
-		</blockTable>
 		<xsl:apply-templates select="title"/>
 		<xsl:apply-templates select="lines"/>
 	</xsl:template>
@@ -82,6 +75,7 @@
 	</xsl:template>
 
 	<xsl:template match="lines">
+        <xsl:apply-templates select="title"/>
 		<blockTable>
 		<xsl:attribute name="style"><xsl:value-of select="@style"/></xsl:attribute>
 		 <xsl:attribute name="colWidths">
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index ab22f169552..3e158b4d0cf 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -100,7 +100,6 @@ class StockMove(osv.osv):
                     'location_id': move.location_dest_id.id,
                     'auto_validate': True,
                     'picking_id': False,
-                    'location_id': dest,
                     'state': 'waiting'
                 })
                 for m in procurement_obj.search(cr, uid, [('move_id','=',move.id)], context):
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 703e5f1bb40..bd1a5cbdec0 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -33,7 +33,8 @@
     seller_ids:
       - delay: 1
         name: base.res_partner_asus
-        qty: 1.0
+        min_qty: 1.0
+        product_uom: product_uom_litre0
     supply_method: buy
     type: product
     uom_id: product.product_uom_kgm
@@ -51,7 +52,8 @@
     seller_ids:
       - delay: 1
         name: base.res_partner_desertic_hispafuentes
-        qty: 2.0
+        min_qty: 2.0
+        product_uom: product.product_uom_kgm
     supply_method: buy
     type: product
     uom_id: product.product_uom_kgm
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index 63d9dbcb451..a9125afe41b 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -10,12 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Product Qty">
+                    <separator string="Change Quantity" colspan="4"/>
+                    <newline/>
 				    <field name="product_qty"/>
 				    <newline/>
+				    <separator colspan="4"/>
 				    <group col="2" colspan="4">
                 		<button icon='gtk-close' special="cancel"
                 			string="Close" />
-                		<button name="change_prod_qty" string="Validate"
+                		<button name="change_prod_qty" string="Approve"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
                 </form>
diff --git a/addons/mrp/wizard/mrp_change_standard_price.py b/addons/mrp/wizard/mrp_change_standard_price.py
index 0a5a054762b..21492bda4f8 100644
--- a/addons/mrp/wizard/mrp_change_standard_price.py
+++ b/addons/mrp/wizard/mrp_change_standard_price.py
@@ -26,7 +26,8 @@ class change_standard_price(osv.osv_memory):
     _description = "Change Standard Price"
     
     _columns = {
-        'change_parent_price': fields.boolean('Change Parent Price'),
+        'change_parent_price': fields.boolean('Change Parent Price', help="This will change the price of parent products also "
+                                              "according to the BoM structure specified for the product."),
     }
     
     
diff --git a/addons/mrp/wizard/mrp_price.py b/addons/mrp/wizard/mrp_price.py
index 55393a4371c..17cf9c53654 100644
--- a/addons/mrp/wizard/mrp_price.py
+++ b/addons/mrp/wizard/mrp_price.py
@@ -25,7 +25,10 @@ class mrp_price(osv.osv_memory):
     _name = 'mrp.product_price'
     _description = 'Product Price'
     _columns = {
-        'number': fields.integer('Number of products to produce', required=True),
+        'number': fields.integer('Quantity', required=True, help="Specify quantity of products to produce or buy. Report of Cost structure will be displayed base on this qunatity."),
+    }
+    _defaults = {
+        'number': 1,
     }
     
     def print_report(self, cr, uid, ids, context=None):
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index 524e1c73c2f..758d0bc5415 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -9,14 +9,16 @@
             <field name="model">mrp.product_price</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Paid ?">
+                <form string="Product Cost Structure">
+                    <separator colspan="4" string="Print Cost Structure of Product." />
 				    <field name="number"/>
 				    <newline/>
+                    <separator string="" colspan="4"/>
 				    <group col="2" colspan="4">
                 		<button icon='gtk-close' special="cancel"
                 			string="Close" />
                 		<button name="print_report" string="Print"
-                			colspan="1" type="object" icon="gtk-ok" />
+                			colspan="1" type="object" icon="gtk-print" />
                 	</group>
                 </form>
             </field>
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index 2fe4edd265e..180c0831577 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -28,7 +28,10 @@ class mrp_product_produce(osv.osv_memory):
     _columns = {
         'product_qty': fields.float('Quantity', required=True), 
         'mode': fields.selection([('consume_produce', 'Consume & Produce'), 
-                                  ('consume', 'Consume Only')], 'Mode', required=True)
+                                  ('consume', 'Consume Only')], 'Mode', required=True,
+                                  help="'Consume only' mode will only consume the products with the quantity selected.\n"
+                                        "'Consume & Produce' mode will consume as well as produce the products with the quantity selected "
+                                        "and it will finish the production order when total ordered quantities are produced."),
     }
 
     def _get_product_qty(self, cr, uid, context):
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index 497a81352f3..aa06715d986 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -39,7 +39,7 @@
     
     
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['procurement'],
     'update_xml': ['mrp_jit.xml'],
     'demo_xml': [],
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 0ce116535c1..d4d5cf98d08 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -49,9 +49,9 @@
     So that we can compare the theoretic delay and real delay.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['stock', 'hr', 'purchase', 'product', 'mrp'],
+    'depends': ['mrp'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 84ae3c304b0..5fbbc5ea18a 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -64,7 +64,7 @@ class mrp_production_workcenter_line(osv.osv):
         """
         res = {}
         for op in self.browse(cr, uid, ids, context=context):
-            res[op.id]= False
+            res[op.id] = False
             if op.date_planned:
                 d = DateTime.strptime(op.date_planned,'%Y-%m-%d %H:%M:%S')
                 i = self.pool.get('resource.calendar').interval_get(cr, uid, op.workcenter_id.calendar_id.id or False, d, op.hour or 0.0)
@@ -136,13 +136,14 @@ class mrp_production_workcenter_line(osv.osv):
 
     def write(self, cr, uid, ids, vals, context={}, 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:
             pids = {}
             pids2 = {}
             for prod in self.browse(cr, uid, ids, context=context):
                 if prod.production_id.workcenter_lines:
                     dstart = min(vals['date_planned'], prod.production_id.workcenter_lines[0]['date_planned'])
-                    self.pool.get('mrp.production').write(cr, uid, [prod.production_id.id], {'date_start':dstart}, context=context, mini=False)
+                    prod_obj.write(cr, uid, [prod.production_id.id], {'date_start':dstart}, context=context, mini=False)
         return result
 
     def action_draft(self, cr, uid, ids):
@@ -222,9 +223,8 @@ class mrp_production(osv.osv):
         @return: Super method
         """
         obj = self.browse(cr, uid, ids)[0]
+        wf_service = netsvc.LocalService("workflow")
         for workcenter_line in obj.workcenter_lines:
-            tmp = self.pool.get('mrp.production.workcenter.line').action_done(cr, uid, [workcenter_line.id])
-            wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_done', cr)
         return super(mrp_production,self).action_production_end(cr, uid, ids)
     
@@ -233,10 +233,8 @@ class mrp_production(osv.osv):
         @return: True 
         """        
         obj = self.browse(cr, uid, ids)[0]
-        workcenter_line_obj = self.pool.get('mrp.production.workcenter.line')
+        wf_service = netsvc.LocalService("workflow")
         for workcenter_line in obj.workcenter_lines:
-            workcenter_line_obj.action_start_working(cr, uid, [workcenter_line.id])
-            wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_start_working', cr)
         return super(mrp_production,self).action_in_production(cr, uid, ids)
     
@@ -245,9 +243,8 @@ class mrp_production(osv.osv):
         @return: Super method
         """
         obj = self.browse(cr, uid, ids)[0]
+        wf_service = netsvc.LocalService("workflow")
         for workcenter_line in obj.workcenter_lines:
-            tmp = self.pool.get('mrp.production.workcenter.line').action_cancel(cr, uid, [workcenter_line.id])
-            wf_service = netsvc.LocalService("workflow")
             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)
 
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 5c626b24814..285f5ff43da 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -32,9 +32,13 @@
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
            <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
-               <field name="state"/>
-               <button name="button_start_working" string="Start working" states="draft,pause" icon="gtk-go-forward"/>
-               <button name="button_done" string="Finished" states="startworking" icon="gtk-jump-to"/>
+                <button name="button_done" string="Finished" states="startworking" icon="gtk-ok"/>
+                <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
+                <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-cancel"/>
+                <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
+                <button name="button_start_working" string="Start" states="draft" icon="gtk-go-forward"/>
+                <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
+                <field name="state"/>
            </xpath>
         </field>
     </record>
@@ -45,7 +49,7 @@
         <field name="type">tree</field>
         <field name="inherit_id" eval="False"/>
         <field name="arch" type="xml">
-            <tree string="Work Orders">
+            <tree string="Work Orders" colors="gray:state in ('done','cancel');black:state in ('draft','startworking');red: state=='pause'">
                 <field name="production_id"/>
                 <field name="date_planned"/>
                 <field name="product"/>
@@ -56,8 +60,12 @@
                 <field name="cycle"/>
                 <field name="hour"/>
                 <field name="state" />
-                <button name="button_start_working" string="Start working" states="draft,pause" icon="gtk-go-forward"/>
-                <button name="button_done" string="Finished" states="startworking" icon="gtk-jump-to"/>
+                <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
+                <button name="button_start_working" string="Start" states="draft" icon="gtk-go-forward"/>
+                <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
+                <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-cancel"/>
+                <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
+                <button name="button_done" string="Finished" states="startworking" icon="gtk-ok"/>
             </tree>
         </field>
     </record>
@@ -103,7 +111,7 @@
                         <field name="uom"/>
                     </group>
 
-                    <separator string="Status" colspan="4"/>
+                    <separator string="State" colspan="4"/>
                     <group colspan="8" col="8">
                         <field name="state"/>
                         <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
@@ -194,6 +202,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,gantt,calendar,graph</field>
         <field name="search_view_id" ref="view_mrp_production_workcenter_form_view_filter"/>
+        <field name="help">Work Orders are manufacturing operations required to produce or assemble products. The different work orders will have different impacts on the costs of manufacture and planning depending on the available workload.</field>
     </record>
 
     <record model="ir.actions.act_window" id="mrp_production_wc_action_planning">
@@ -203,6 +212,7 @@
         <field name="view_type">form</field>
         <field name="domain">[('production_state','in',('ready','confirmed','in_production'))]</field>
         <field name="view_mode">tree,form,graph,calendar</field>
+        <field name="help">To manufacture or assemble products, as well as using raw materials and finished product you must also handle manufacturing operations. Manufacturing operations are often called work orders. The different operations will have different impacts on the costs of manufacture and planning depending on the available workload.</field>
     </record>
 
 
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index 58efc27f824..c9a4068f925 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -33,7 +33,7 @@
            * Repair quotation report
            * Notes for the technician and for the final customer           
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['mrp', 'sale', 'account'],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/mrp_subproduct/__openerp__.py b/addons/mrp_subproduct/__openerp__.py
index 02dd29bd73d..f208e0b1a76 100644
--- a/addons/mrp_subproduct/__openerp__.py
+++ b/addons/mrp_subproduct/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -32,7 +32,7 @@ Without this module:
 With this module:
     A + B + C -> D + E
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'mrp'],
     'init_xml': [],
diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index 8e9105a4c40..fdae2efa3cd 100644
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -28,7 +28,7 @@
     Multicompany module is for managing a multicompany environment.
     This module is the base module for other multicompany modules.
     """,
-    'author': 'Tiny,SYLEAM',
+    'author': 'OpenERP SA,SYLEAM',
     'website': 'http://www.openerp.com/',
     'depends': [
         'base',
diff --git a/addons/multi_company/i18n/es.po b/addons/multi_company/i18n/es.po
index 33cdaa06043..54da6b62445 100644
--- a/addons/multi_company/i18n/es.po
+++ b/addons/multi_company/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-08 11:46+0000\n"
-"PO-Revision-Date: 2010-03-07 17:36+0000\n"
-"Last-Translator: Edgardo Ramos Roque <Unknown>\n"
+"PO-Revision-Date: 2010-07-23 19:00+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-07-24 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
@@ -46,7 +47,7 @@ msgstr "El IVA no parece ser correcto"
 #. module: multi_company
 #: 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 la acción"
+msgstr "Nombre de modelo no válido en la definición de la acción."
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/ru.po b/addons/multi_company/i18n/ru.po
index 8b9ce974399..82fb3aa107c 100644
--- a/addons/multi_company/i18n/ru.po
+++ b/addons/multi_company/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-08 11:46+0000\n"
-"PO-Revision-Date: 2010-07-07 22:52+0000\n"
-"Last-Translator: Pomazan Bogdan <Unknown>\n"
+"PO-Revision-Date: 2010-07-14 08:17+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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-07-09 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
@@ -35,6 +35,7 @@ msgstr ""
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию."
 
 #. module: multi_company
 #: constraint:res.partner:0
@@ -115,7 +116,7 @@ msgstr "Ошибка. UOS и UOM должны принадлежать к раз
 #. module: multi_company
 #: model:product.category,name:multi_company.Odoo1
 msgid "Odoo Offers"
-msgstr ""
+msgstr "Предложения Odoo"
 
 #. module: multi_company
 #: constraint:res.company:0
@@ -155,7 +156,7 @@ msgstr "Выражение"
 #. module: multi_company
 #: model:product.template,name:multi_company.product_product_odoo1_product_template
 msgid "Odoo Offer"
-msgstr ""
+msgstr "Предложение Odoo"
 
 #. module: multi_company
 #: field:multi_company.default,sequence:0
diff --git a/addons/olap/__openerp__.py b/addons/olap/__openerp__.py
index eb0c89db3f8..1171cdd23f9 100644
--- a/addons/olap/__openerp__.py
+++ b/addons/olap/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Olap Schemes Management",
     "version" : "0.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "depends" : ["base"],
     "category" : "Generic Modules/Olap",
diff --git a/addons/olap/data/olap_cube_view.xml b/addons/olap/data/olap_cube_view.xml
index c3f43b89740..4ffbab0ff60 100644
--- a/addons/olap/data/olap_cube_view.xml
+++ b/addons/olap/data/olap_cube_view.xml
@@ -76,7 +76,30 @@
 	            <field name="model">olap.parameters.config.wizard</field>
 	            <field name="type">form</field>
 	            <field name="arch" type="xml">
-	                <form string="Parameters Configure">
+                <form string="Business Intelligence Server Configuration">
+                   <group colspan="4" col="8">
+                       <group colspan="3" width="220" height="250">
+                           <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+                           <newline/>
+                           <label align="0.0" string="This wizard will automatically configure the web client for Business Intelligence." width="200" colspan="2"/>
+                       </group>
+                       <!--separator string="" orientation="vertical" colspan="1" rowspan="12"/-->
+                       <group colspan="4">
+                           <separator string=" Business Intelligence Web Client" colspan="4"/>
+                           <field name="host_name" colspan="4"/>
+                           <field name="host_port" colspan="4"/>
+                       </group>
+                       <group colspan="8" col="8">
+                       <separator string="" colspan="8"/>
+                           <group colspan="4" width="220">
+                               <field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
+                          </group>
+                           <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
+                          <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
+                       </group>
+                   </group>
+               </form>
+	                <!--form string="Parameters Configure">
 	                    <separator string="BI Web Client." colspan="4"/>
 	                    <label string="This wizard will automatically configure the web client for BI." align="0.0" colspan="4"/>
 	                    <field name="host_name" colspan="4"/>
@@ -87,7 +110,7 @@
 	                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
 	                        <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
 	                    </group>
-	                </form>
+	                </form-->
 	            </field>
 	        </record>
 	
diff --git a/addons/olap/i18n/pl.po b/addons/olap/i18n/pl.po
index d71b7f0aac4..32018b0455d 100644
--- a/addons/olap/i18n/pl.po
+++ b/addons/olap/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 05:24+0000\n"
-"PO-Revision-Date: 2010-03-29 19:04+0000\n"
+"PO-Revision-Date: 2010-07-26 15:08+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-06-22 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-07-27 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
@@ -28,7 +28,7 @@ msgstr "Ukryj"
 #: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
 #: view:olap.saved.query:0
 msgid "Olap Saved Query"
-msgstr ""
+msgstr "Zapisane zapytanie OLAP"
 
 #. module: olap
 #: field:olap.query.logs,time:0
@@ -39,12 +39,12 @@ msgstr "Czas"
 #. module: olap
 #: view:bi.auto.configure.wizard:0
 msgid "Auto Configure Structure"
-msgstr ""
+msgstr "Struktura autokonfiguracji"
 
 #. module: olap
 #: view:olap.fact.database:0
 msgid "Olap fact database"
-msgstr ""
+msgstr "Baza faktów OLAP"
 
 #. module: olap
 #: help:olap.measure,value_sql:0
@@ -57,7 +57,7 @@ msgstr ""
 #. module: olap
 #: field:olap.cube.table,schema_id:0
 msgid "Schema id"
-msgstr ""
+msgstr "ID schematu"
 
 #. module: olap
 #: field:olap.schema,database_id:0
@@ -265,7 +265,7 @@ msgstr "Autokonfiguracja"
 #. module: olap
 #: field:olap.schema,note:0
 msgid "Schema description"
-msgstr ""
+msgstr "Opis schematu"
 
 #. module: olap
 #: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
@@ -296,17 +296,17 @@ msgstr "Baza danych faktów OLAP"
 #. module: olap
 #: view:bi.auto.configure.wizard:0
 msgid "Auto Congifuring Tables"
-msgstr ""
+msgstr "Autokonfiguracja tabel"
 
 #. module: olap
 #: field:olap.application,name:0
 msgid "Application name"
-msgstr ""
+msgstr "Nazwa programu"
 
 #. module: olap
 #: field:olap.cube.table,column_link_id:0
 msgid "Relational Column"
-msgstr ""
+msgstr "Kolumna relacyjna"
 
 #. module: olap
 #: field:olap.level,type:0
@@ -316,12 +316,12 @@ msgstr ""
 #. module: olap
 #: field:olap.cube,name:0
 msgid "Cube name"
-msgstr ""
+msgstr "Nazwa kostki"
 
 #. module: olap
 #: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
 msgid "Olap Applicatiion Table"
-msgstr ""
+msgstr "Tabela aplikacji OLAP"
 
 #. module: olap
 #: model:ir.model,name:olap.model_olap_saved_query
@@ -331,23 +331,23 @@ msgstr ""
 #. module: olap
 #: field:olap.level,column_name:0
 msgid "Columns Name"
-msgstr ""
+msgstr "Nazwa kolumn"
 
 #. module: olap
 #: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
 msgid "Olap Hierarchies"
-msgstr ""
+msgstr "Hierarchie OLAP"
 
 #. module: olap
 #: field:olap.schema,ready:0
 msgid "Ready"
-msgstr ""
+msgstr "Gotowe"
 
 #. module: olap
 #: selection:olap.measure,measure_type:0
 #: field:olap.measure,value_column:0
 msgid "Fact Table Column"
-msgstr ""
+msgstr "Kolumna tabeli faktów"
 
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
@@ -355,66 +355,66 @@ msgstr ""
 #: view:olap.fact.database:0
 #: field:olap.fact.database,table_ids:0
 msgid "Tables"
-msgstr ""
+msgstr "Tabele"
 
 #. module: olap
 #: model:ir.model,name:olap.model_olap_application
 msgid "Olap application"
-msgstr ""
+msgstr "Aplikacja OLAP"
 
 #. module: olap
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: olap
 #: selection:olap.schema,state:0
 msgid "Schema is ready to use"
-msgstr ""
+msgstr "Schemat gotowy do zastosowania"
 
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_designer_url
 msgid "Cube Designer"
-msgstr ""
+msgstr "Projektant kostek"
 
 #. module: olap
 #: field:olap.fact.database,db_login:0
 msgid "Database login"
-msgstr ""
+msgstr "Login bazy danych"
 
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
 msgid "Application Table"
-msgstr ""
+msgstr "Tabela aplikacji"
 
 #. module: olap
 #: wizard_view:olap.query.logs.clear,info:0
 #: wizard_view:olap.query.logs.clear,ok:0
 msgid "Logs Cleared successfully"
-msgstr ""
+msgstr "Logi skasowane"
 
 #. module: olap
 #: model:ir.model,name:olap.model_olap_schema
 #: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
 #: view:olap.schema:0
 msgid "Olap Schema"
-msgstr ""
+msgstr "Schemat OLAP"
 
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_view_olap_application_form
 msgid "Application"
-msgstr ""
+msgstr "Aplikacja"
 
 #. module: olap
 #: wizard_field:olap.query_builder,exec,mdx_query_output:0
 #: wizard_field:olap.query_builder,ok,mdx_query_output:0
 msgid "MDX Query Output"
-msgstr ""
+msgstr "Rezultat zapytania MDX"
 
 #. module: olap
 #: field:olap.hierarchy,primary_key_table:0
 msgid "Primary key table"
-msgstr ""
+msgstr "Tabela kluczy podstawowych"
 
 #. module: olap
 #: help:olap.measure,table_name:0
@@ -422,42 +422,44 @@ msgid ""
 "The name of the table on which the column is defined. If False, take the "
 "table from the cube."
 msgstr ""
+"Nazwa tabeli, na podstawie której zdefiniowano kolumnę. Jeśli brak, to "
+"zostanie pobrana tabela z kostki."
 
 #. module: olap
 #: view:olap.warehouse.wizard:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Magazyn"
 
 #. module: olap
 #: model:ir.actions.act_window,name:olap.action_olap_dimension_form
 msgid "Olap Dimensions"
-msgstr ""
+msgstr "Wymiary OLAP"
 
 #. module: olap
 #: field:olap.query.logs,user_id:0
 msgid "Tiny ERP User"
-msgstr ""
+msgstr "Użytkownik OpenERP"
 
 #. module: olap
 #: model:ir.actions.wizard,name:olap.bi_application_configuration
 msgid "Configure from Application"
-msgstr ""
+msgstr "Konfiguruj z aplikacji"
 
 #. module: olap
 #: field:olap.fact.database,db_port:0
 msgid "Database port"
-msgstr ""
+msgstr "Przeniesienie bazy danych"
 
 #. module: olap
 #: help:olap.parameters.config.wizard,host_port:0
 msgid ""
 "Put the port for the server. Put 8080 if                 its not clear."
-msgstr ""
+msgstr "Wstaw port serwera. Wpisz 8080, jeśli nie wiesz nic o porcie."
 
 #. module: olap
 #: selection:olap.schema,state:0
 msgid "The Structure is Loaded"
-msgstr ""
+msgstr "Załadowano strukturę"
 
 #. module: olap
 #: field:olap.dimension,cube_id:0
@@ -465,48 +467,48 @@ msgstr ""
 #: field:olap.query.logs,cube_id:0
 #: field:olap.saved.query,cube_id:0
 msgid "Cube"
-msgstr ""
+msgstr "Kostka"
 
 #. module: olap
 #: field:olap.cube.table,available_table_ids:0
 msgid "Available Tables"
-msgstr ""
+msgstr "Dostępne tabele"
 
 #. module: olap
 #: view:olap.schema:0
 msgid "Configure Manually"
-msgstr ""
+msgstr "Konfiguruj ręcznie"
 
 #. module: olap
 #: field:olap.database.columns,related_to:0
 msgid "Related To"
-msgstr ""
+msgstr "Powiązane z"
 
 #. module: olap
 #: view:olap.database.columns:0
 #: view:olap.database.tables:0
 msgid "Olap database columns"
-msgstr ""
+msgstr "Kolumny bazy danych OLAP"
 
 #. module: olap
 #: field:olap.cube.table.line,field_id:0
 msgid "Link Field"
-msgstr ""
+msgstr "Pole łaczące"
 
 #. module: olap
 #: view:olap.schema:0
 msgid "Mark as Configured"
-msgstr ""
+msgstr "Oznacz jako skonfigurowane"
 
 #. module: olap
 #: view:olap.application.field:0
 msgid "Olap Application Field"
-msgstr ""
+msgstr "Pole aplikacji OLAP"
 
 #. module: olap
 #: selection:olap.measure,formatstring:0
 msgid "Comma Seperator (0,000)"
-msgstr ""
+msgstr "Separataor dziesiętny (0,000)"
 
 #. module: olap
 #: field:olap.measure,agregator:0
@@ -516,17 +518,17 @@ msgstr ""
 #. module: olap
 #: wizard_view:olap.application.configuration,configure:0
 msgid "Your database structure (Open ERP) has been sucessfully configured."
-msgstr ""
+msgstr "Twoja struktura bazy danych (OpenERP) została skonfigurowana."
 
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_bi_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracja"
 
 #. module: olap
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Niewłaściwy XML dla architektury widoku!"
 
 #. module: olap
 #: help:olap.parameters.config.wizard,host_name:0
@@ -534,26 +536,27 @@ msgid ""
 "Put here the server address or IP                 Put localhost if its not "
 "clear."
 msgstr ""
+"Wprowadź adres IP serwera lub wpisz localhost, jeśli nie wiesz o co chodzi."
 
 #. module: olap
 #: view:olap.database.tables:0
 msgid "Database tables"
-msgstr ""
+msgstr "Tabele bazy danych"
 
 #. module: olap
 #: view:olap.schema:0
 msgid "Reload Structure"
-msgstr ""
+msgstr "Przeładuj strukturę"
 
 #. module: olap
 #: wizard_view:olap.application.configuration,init:0
 msgid "This will Auto Configure Application"
-msgstr ""
+msgstr "To automatycznie skonfiguruje aplikację"
 
 #. module: olap
 #: view:bi.load.db.wizard:0
 msgid "Load Data Structure"
-msgstr ""
+msgstr "Załaduj strukturę danych"
 
 #. module: olap
 #: view:bi.auto.configure.wizard:0
@@ -565,7 +568,7 @@ msgstr ""
 #: wizard_button:olap.query_builder,exec,end:0
 #: wizard_button:olap.query_builder,ok,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 #. module: olap
 #: view:bi.load.db.wizard:0
@@ -574,40 +577,43 @@ msgid ""
 "tables and columns to simplify end-users interface. The following database "
 "will be loaded:"
 msgstr ""
+"Po załadowaniu struktury, będziesz mógł ukryć/pokazać lub przemianować "
+"tabele lub kolumny, aby uprościć interfejs użytkownika. Następujące bazy "
+"danych zostaną załadowane:"
 
 #. module: olap
 #: model:ir.actions.act_window,name:olap.action_olap_level_form
 #: model:ir.ui.menu,name:olap.menu_action_olap_level_form
 #: view:olap.level:0
 msgid "Olap Level"
-msgstr ""
+msgstr "Poziom OLAP"
 
 #. module: olap
 #: field:olap.fact.database,loaded:0
 msgid "Loaded"
-msgstr ""
+msgstr "Wczytane"
 
 #. module: olap
 #: help:olap.fact.database,db_name:0
 msgid "Name of the database to be used for analysis."
-msgstr ""
+msgstr "Nazwa bazy danych do zastosowania w analizie."
 
 #. module: olap
 #: help:olap.fact.database,db_login:0
 msgid "Login for the database name specified."
-msgstr ""
+msgstr "Zaloguj się do poanej bazy danych."
 
 #. module: olap
 #: field:olap.hierarchy,dimension_id:0
 #: wizard_field:olap.query_builder,exec,dimension:0
 #: wizard_field:olap.query_builder,ok,dimension:0
 msgid "Dimension"
-msgstr ""
+msgstr "Wymiar"
 
 #. module: olap
 #: model:ir.model,name:olap.model_olap_application_table
 msgid "Olap application table"
-msgstr ""
+msgstr "Tabela aplikacji OLAP"
 
 #. module: olap
 #: wizard_view:olap.load.table,init:0
@@ -616,51 +622,53 @@ msgid ""
 "so that you will be able to work on it, and specify a better structure      "
 "according to your reporting needs."
 msgstr ""
+"Wczytamy kompletną strukturę bazy danych przez introspekcję. Będziesz mógł "
+"na niej pracować i określić lepszą strukturę w zależności od twoich potrzeb."
 
 #. module: olap
 #: field:olap.saved.query,axis_keys:0
 msgid "Axis Keys"
-msgstr ""
+msgstr "Klucze osi"
 
 #. module: olap
 #: field:olap.cube,query_log:0
 msgid "Query Logging"
-msgstr ""
+msgstr "Logowanie zapytań"
 
 #. module: olap
 #: field:olap.measure,measure_type:0
 msgid "Measure Type"
-msgstr ""
+msgstr "Typ miary"
 
 #. module: olap
 #: field:olap.database.tables,fact_database_id:0
 msgid "Database Id"
-msgstr ""
+msgstr "ID bazy danych"
 
 #. module: olap
 #: help:olap.fact.database,db_host:0
 msgid "Give hostname to make connection to the database."
-msgstr ""
+msgstr "Podaj nazwę hosta do połączenia z bazą danych."
 
 #. module: olap
 #: field:olap.level,hierarchy_id:0
 msgid "Hierarchy"
-msgstr ""
+msgstr "Hierarchia"
 
 #. module: olap
 #: selection:olap.schema,state:0
 msgid "The Structure is Configured."
-msgstr ""
+msgstr "Skonfigurowano strukturę."
 
 #. module: olap
 #: model:ir.actions.act_window,name:olap.action_olap_schema_form
 msgid "Olap Schemas"
-msgstr ""
+msgstr "Schematy OLAP"
 
 #. module: olap
 #: field:olap.cube,table_id:0
 msgid "Fact table"
-msgstr ""
+msgstr "Tabela faktów"
 
 #. module: olap
 #: view:bi.auto.configure.wizard:0
@@ -670,11 +678,14 @@ msgid ""
 "comprehend name. You can hides particular data and columns by reconfiguring "
 "the structure option."
 msgstr ""
+"To automatycznie skonfiguruje aplikację. Pomoże to zwiększyć czytelność "
+"tabel i kolumn przez nadanie prostych nazw. Będziesz mógł ukryć pewne dane "
+"lub kolumny rekonfigurując strukturę."
 
 #. module: olap
 #: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
 msgid "Olap Applicatiion Field"
-msgstr ""
+msgstr "Pole aplikacji OLAP"
 
 #. module: olap
 #: field:olap.query.logs,query:0
@@ -682,86 +693,86 @@ msgstr ""
 #: view:olap.warehouse.wizard:0
 #: field:olap.warehouse.wizard,query:0
 msgid "Query"
-msgstr ""
+msgstr "Zapytanie"
 
 #. module: olap
 #: view:olap.schema:0
 msgid "Auto Application Configuration"
-msgstr ""
+msgstr "Automatyczna konfiguracja aplikacji"
 
 #. module: olap
 #: selection:olap.measure,formatstring:0
 msgid "Postfix Default Currency(0000.00 EUR)"
-msgstr ""
+msgstr "Sufiks domyślnej waluty(0000.00 EUR)"
 
 #. module: olap
 #: field:bi.load.db.wizard,db_name:0
 #: wizard_field:olap.load.table,init,db_name:0
 msgid "Database Name"
-msgstr ""
+msgstr "Nazwa bazy danych"
 
 #. module: olap
 #: field:olap.cube,measure_ids:0
 msgid "Measures"
-msgstr ""
+msgstr "Miary"
 
 #. module: olap
 #: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
 #: wizard_view:olap.query_builder,exec:0
 #: wizard_view:olap.query_builder,ok:0
 msgid "Query Builder"
-msgstr ""
+msgstr "Kreator zapytań"
 
 #. module: olap
 #: field:olap.cube,dimension_ids:0
 msgid "Dimensions"
-msgstr ""
+msgstr "Wymiary"
 
 #. module: olap
 #: model:ir.model,name:olap.model_olap_cube
 #: view:olap.cube:0
 msgid "Olap cube"
-msgstr ""
+msgstr "Kostka OLAP"
 
 #. module: olap
 #: model:ir.actions.act_window,name:olap.action_olap_warehouse
 #: model:ir.model,name:olap.model_olap_warehouse_wizard
 #: model:ir.ui.menu,name:olap.menu_bi_warehouse
 msgid "Olap Warehouse"
-msgstr ""
+msgstr "Hurtownia OLAP"
 
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
 msgid "Application Field"
-msgstr ""
+msgstr "Pole aplikacji"
 
 #. module: olap
 #: model:ir.model,name:olap.model_olap_dimension
 #: view:olap.dimension:0
 msgid "Olap dimension"
-msgstr ""
+msgstr "Wymiar OLAP"
 
 #. module: olap
 #: field:olap.application.field,name:0
 msgid "Application field name"
-msgstr ""
+msgstr "Nazwa pola aplikacji"
 
 #. module: olap
 #: view:olap.fact.database:0
 msgid "Connection parameters"
-msgstr ""
+msgstr "Parametry połączenia"
 
 #. module: olap
 #: field:bi.auto.configure.wizard,name:0
 #: field:bi.load.db.wizard,fact_table:0
 #: wizard_field:olap.load.table,init,fact_table:0
 msgid "Fact Name"
-msgstr ""
+msgstr "Nazwa faktu"
 
 #. module: olap
 #: view:olap.database.columns:0
 msgid "Database columns"
-msgstr ""
+msgstr "Kolumny bazy danych"
 
 #. module: olap
 #: field:olap.application.table,table_name:0
@@ -769,41 +780,41 @@ msgstr ""
 #: field:olap.level,table_name:0
 #: field:olap.measure,table_name:0
 msgid "Table name"
-msgstr ""
+msgstr "Nazwa tabeli"
 
 #. module: olap
 #: help:olap.measure,measure_type:0
 msgid "Select between auto column or sql expression for the measures"
-msgstr ""
+msgstr "Wybierz między automatycznymi kolumnami albo wyrażeniem sql dla miar"
 
 #. module: olap
 #: model:ir.actions.wizard,name:olap.bi_load_column
 msgid "Open Columns"
-msgstr ""
+msgstr "Otwórz kolumny"
 
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
 #: field:olap.database.tables,columns:0
 msgid "Columns"
-msgstr ""
+msgstr "Kolumny"
 
 #. module: olap
 #: model:ir.actions.wizard,name:olap.bi_test_connection
 #: view:olap.fact.database:0
 msgid "Test Connection"
-msgstr ""
+msgstr "Testuj połączenie"
 
 #. module: olap
 #: model:ir.actions.act_window,name:olap.action_olap_measure_form
 #: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
 msgid "Olap Measures"
-msgstr ""
+msgstr "Miary OLAP"
 
 #. module: olap
 #: wizard_button:olap.application.configuration,init,configure:0
 #: view:olap.parameters.config.wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguracja"
 
 #. module: olap
 #: wizard_view:olap.load.table,init:0
@@ -812,102 +823,107 @@ msgid ""
 "rename tables and columns to simplify end-users interface. The following "
 "database      will be loaded:"
 msgstr ""
+"Po wczytaniu struktury będziesz mógł ukryć/pokazać oraz przemianować tabele "
+"lub kolumny, aby uprościć interfejs użytkownika. Następujące bazy danych "
+"zostaną wczytane:"
 
 #. module: olap
 #: 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: olap
 #: wizard_field:olap.query_builder,exec,hierarchy:0
 #: wizard_field:olap.query_builder,ok,hierarchy:0
 msgid "Hiearchy"
-msgstr ""
+msgstr "Hierarchia"
 
 #. module: olap
 #: selection:olap.measure,measure_type:0
 #: field:olap.measure,value_sql:0
 msgid "SQL Expression"
-msgstr ""
+msgstr "Wyrażenie SQL"
 
 #. module: olap
 #: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
 msgid "Load Tables"
-msgstr ""
+msgstr "Wczytaj tabele"
 
 #. module: olap
 #: field:olap.hierarchy,level_ids:0
 msgid "Levels"
-msgstr ""
+msgstr "Poziomy"
 
 #. module: olap
 #: model:ir.model,name:olap.model_olap_application_field
 msgid "Olap application field"
-msgstr ""
+msgstr "Pole aplikacji OALP"
 
 #. module: olap
 #: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
 msgid "Database Columns"
-msgstr ""
+msgstr "Kolumny bazy danych"
 
 #. module: olap
 #: field:olap.database.columns,active:0
 #: field:olap.database.tables,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktywne"
 
 #. module: olap
 #: selection:olap.measure,datatype:0
 msgid "Integer"
-msgstr ""
+msgstr "Liczba całkowita"
 
 #. module: olap
 #: wizard_view:olap.application.configuration,init:0
 msgid " Auto Configure "
-msgstr ""
+msgstr " Autokonfiguracja "
 
 #. module: olap
 #: selection:olap.measure,agregator:0
 msgid "Sum"
-msgstr ""
+msgstr "Suma"
 
 #. module: olap
 #: wizard_field:olap.query.logs.clear,init,user_name:0
 #: field:olap.saved.query,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Użytkownik"
 
 #. module: olap
 #: field:olap.query.logs,count:0
 msgid "Count"
-msgstr ""
+msgstr "Licznik"
 
 #. module: olap
 #: field:olap.database.tables,name:0
 msgid "End-User Name"
-msgstr ""
+msgstr "nazwa użytkownika"
 
 #. module: olap
 #: selection:olap.measure,formatstring:0
 msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
-msgstr ""
+msgstr "Sufiks domyślnej waluty z separatorem dziesiętnym (0,000.00 EUR)"
 
 #. module: olap
 #: field:olap.measure,datatype:0
 msgid "Datatype"
-msgstr ""
+msgstr "Typ danych"
 
 #. module: olap
 #: wizard_button:olap.query_builder,back,ok:0
 #: wizard_button:olap.query_builder,init,ok:0
 msgid "Fetch Data"
-msgstr ""
+msgstr "Pobierz dane"
 
 #. module: olap
 #: selection:olap.measure,formatstring:0
 msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
-msgstr ""
+msgstr "Prefiks domyślnej waluty z separatorem dziesiętnym (0,000.00 EUR)"
 
 #. module: olap
 #: wizard_view:olap.load.table,info:0
@@ -915,12 +931,12 @@ msgstr ""
 #: wizard_view:olap.query.logs.clear,info:0
 #: wizard_view:olap.query.logs.clear,ok:0
 msgid "Load Data"
-msgstr ""
+msgstr "Wczytaj dane"
 
 #. module: olap
 #: field:olap.cube,query_ids:0
 msgid "Queries"
-msgstr ""
+msgstr "Zapytania"
 
 #. module: olap
 #: selection:olap.fact.database,type:0
@@ -932,61 +948,61 @@ msgstr ""
 #: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
 #: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
 msgid "Olap Cubes"
-msgstr ""
+msgstr "Kostki OLAP"
 
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
 msgid "Olap Cubes Table"
-msgstr ""
+msgstr "Tabela kostek OLAP"
 
 #. module: olap
 #: field:olap.measure,name:0
 msgid "Measure name"
-msgstr ""
+msgstr "Nazwa miary"
 
 #. module: olap
 #: selection:olap.fact.database,connection_type:0
 msgid "Socket"
-msgstr ""
+msgstr "Gniazdo"
 
 #. module: olap
 #: field:olap.fact.database,connection_type:0
 msgid "Connection type"
-msgstr ""
+msgstr "Typ połączenia"
 
 #. module: olap
 #: selection:olap.measure,agregator:0
 msgid "count"
-msgstr ""
+msgstr "liczba"
 
 #. module: olap
 #: field:olap.fact.database,db_name:0
 msgid "Database name"
-msgstr ""
+msgstr "Nazwa bazy danych"
 
 #. module: olap
 #: field:olap.database.columns,type:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: olap
 #: view:olap.database.columns:0
 #: view:olap.database.tables:0
 msgid "Show"
-msgstr ""
+msgstr "Pokaż"
 
 #. module: olap
 #: wizard_button:olap.query_builder,exec,back:0
 #: wizard_button:olap.query_builder,ok,back:0
 msgid "Change cube"
-msgstr ""
+msgstr "Zmień kostkę"
 
 #. module: olap
 #: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
 #: view:olap.cube.table:0
 #: field:olap.cube.table,line_ids:0
 msgid "Database Tables"
-msgstr ""
+msgstr "Tabele bazy danych"
 
 #. module: olap
 #: help:olap.level,table_name:0
@@ -994,81 +1010,83 @@ msgid ""
 "The name of the table on which the column is defined. If False, take the "
 "table from the hierarchy."
 msgstr ""
+"Nazwa tabeli, wg której zdefiniowano kolumnę. Jeśli brak, to wykorzystaj "
+"tabelę z hierarchii."
 
 #. module: olap
 #: selection:olap.schema,state:0
 msgid "Nothing has been Configured"
-msgstr ""
+msgstr "Nic nie skonfigurowano"
 
 #. module: olap
 #: field:olap.dimension,name:0
 msgid "Dimension name"
-msgstr ""
+msgstr "Nazwa wymiaru"
 
 #. module: olap
 #: wizard_button:olap.load.table,ok,end:0
 msgid "Continue and Configure Structure"
-msgstr ""
+msgstr "Kontynuuj i konfiguruj strukturę"
 
 #. module: olap
 #: model:ir.model,name:olap.model_olap_measure
 #: view:olap.measure:0
 msgid "Olap measure"
-msgstr ""
+msgstr "Miara OLAP"
 
 #. module: olap
 #: help:olap.cube,table_id:0
 msgid "Table(s) for cube."
-msgstr ""
+msgstr "Tabele dla kostki"
 
 #. module: olap
 #: wizard_field:olap.query_builder,exec,measure:0
 #: wizard_field:olap.query_builder,ok,measure:0
 msgid "Measure"
-msgstr ""
+msgstr "Miara"
 
 #. module: olap
 #: field:olap.database.columns,column_db_name:0
 msgid "Column DBName"
-msgstr ""
+msgstr "Nazwa kolumny BD"
 
 #. module: olap
 #: selection:olap.schema,state:0
 msgid "We Can Start building Cube"
-msgstr ""
+msgstr "Można zacząć budować kostkę"
 
 #. module: olap
 #: field:olap.cube.table.line,table_id:0
 msgid "Database Table"
-msgstr ""
+msgstr "Tabela bazy danych"
 
 #. module: olap
 #: field:olap.schema,name:0
 msgid "Schema name"
-msgstr ""
+msgstr "Nazwa schematu"
 
 #. module: olap
 #: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
 #: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
 #: view:olap.query.logs:0
 msgid "My Logs"
-msgstr ""
+msgstr "Moje logi"
 
 #. module: olap
 #: view:olap.fact.database:0
 msgid "Information"
-msgstr ""
+msgstr "Informacja"
 
 #. module: olap
 #: wizard_field:olap.query_builder,back,cube_schema:0
 #: wizard_field:olap.query_builder,init,cube_schema:0
 msgid "Select Cube"
-msgstr ""
+msgstr "Wybierz kostkę"
 
 #. module: olap
 #: field:olap.hierarchy,table_id:0
 msgid "Fact table(s)"
-msgstr ""
+msgstr "tabele faktów"
 
 #. module: olap
 #: model:ir.actions.url,name:olap.menu_url_cube_designer
@@ -1078,48 +1096,48 @@ msgstr ""
 #. module: olap
 #: model:ir.actions.act_window,name:olap.action_config_bi_parameters
 msgid "Parameters Configuration"
-msgstr ""
+msgstr "Konfiguracja parametrów"
 
 #. module: olap
 #: view:olap.schema:0
 msgid "Connect to Database"
-msgstr ""
+msgstr "Połacz z bazą danych"
 
 #. module: olap
 #: selection:olap.schema,state:0
 msgid "Database Connected"
-msgstr ""
+msgstr "Baza podłączona"
 
 #. module: olap
 #: field:olap.application.field,table_name:0
 #: field:olap.application.table,name:0
 msgid "Application table name"
-msgstr ""
+msgstr "Nazwa tabeli aplikacji"
 
 #. module: olap
 #: help:olap.hierarchy,table_id:0
 msgid "Table(s) to make hierarchy on the cube."
-msgstr ""
+msgstr "Tabele do tworzenia hierarchii w kostce"
 
 #. module: olap
 #: view:olap.fact.database:0
 msgid "General information"
-msgstr ""
+msgstr "Informacje ogólne"
 
 #. module: olap
 #: field:olap.application,query:0
 msgid "Application Query"
-msgstr ""
+msgstr "Zapytanie aplikacji"
 
 #. module: olap
 #: help:olap.cube,query_log:0
 msgid "Enabling  this will log all the queries in the browser"
-msgstr ""
+msgstr "Po włączeniu będą logowane wszystkie zapytania"
 
 #. module: olap
 #: field:olap.saved.query,mdx_id:0
 msgid "Module"
-msgstr ""
+msgstr "Moduł"
 
 #. module: olap
 #: field:olap.application.field,is_hidden:0
@@ -1127,32 +1145,32 @@ msgstr ""
 #: field:olap.database.columns,hide:0
 #: field:olap.database.tables,hide:0
 msgid "Hidden"
-msgstr ""
+msgstr "Ukryte"
 
 #. module: olap
 #: field:olap.dimension,hierarchy_ids:0
 msgid "Hierarchies"
-msgstr ""
+msgstr "Hierarchie"
 
 #. module: olap
 #: field:olap.query.logs,result_size:0
 msgid "Result Size"
-msgstr ""
+msgstr "Rozmiar rezultatu"
 
 #. module: olap
 #: view:olap.application:0
 msgid "Olap Application"
-msgstr ""
+msgstr "Aplikacja OLAP"
 
 #. module: olap
 #: model:ir.model,name:olap.model_olap_database_tables
 msgid "Olap Database Tables"
-msgstr ""
+msgstr "Tabele bazy danych OLAP"
 
 #. module: olap
 #: selection:olap.measure,formatstring:0
 msgid "Prefix Default Currency (EUR 0000.00)"
-msgstr ""
+msgstr "Prefiks domyślnej waluty (EUR 0000.00)"
 
 #. module: olap
 #: view:olap.cube.table:0
@@ -1162,104 +1180,105 @@ msgstr ""
 #. module: olap
 #: view:olap.parameters.config.wizard:0
 msgid "Parameters Configure"
-msgstr ""
+msgstr "Konfiguruj parametry"
 
 #. module: olap
 #: model:ir.model,name:olap.model_olap_hierarchy
 #: view:olap.hierarchy:0
 msgid "Olap hierarchy"
-msgstr ""
+msgstr "Hierarchia OLAP"
 
 #. module: olap
 #: model:ir.model,name:olap.model_olap_cube_table
 #: model:ir.model,name:olap.model_olap_cube_table_line
 msgid "Olap cube table"
-msgstr ""
+msgstr "Tabela kostki OLAP"
 
 #. module: olap
 #: field:olap.application.field,field_name:0
 msgid "Field name"
-msgstr ""
+msgstr "Nazwa pola"
 
 #. module: olap
 #: model:ir.model,name:olap.model_olap_query_logs
 msgid "Olap query logs"
-msgstr ""
+msgstr "Logi zapytań OLAP"
 
 #. module: olap
 #: field:olap.fact.database,name:0
 msgid "Fact name"
-msgstr ""
+msgstr "Nazwa faktu"
 
 #. module: olap
 #: help:olap.measure,formatstring:0
 msgid " Let you specify how the measure to be displayed in cube browser"
 msgstr ""
+" Pozwala określać, jak ma być wyświetlana miara w przeglądarce kostki"
 
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_bi_server_parameters
 msgid "Server Parameters"
-msgstr ""
+msgstr "Parametry serwera"
 
 #. module: olap
 #: wizard_view:olap.load.table,init:0
 #: wizard_button:olap.load.table,init,ok:0
 #: view:olap.schema:0
 msgid "Load Database Structure"
-msgstr ""
+msgstr "Wczytaj strukturę bazy danych"
 
 #. module: olap
 #: field:olap.level,name:0
 msgid "Level name"
-msgstr ""
+msgstr "Nazwa poziomu"
 
 #. module: olap
 #: field:olap.cube,schema_id:0
 #: field:olap.query.logs,schema_id:0
 #: field:olap.saved.query,schema_id:0
 msgid "Schema"
-msgstr ""
+msgstr "Schemat"
 
 #. module: olap
 #: field:olap.fact.database,connection_url:0
 #: field:olap.schema,app_detect:0
 msgid "Connection URL"
-msgstr ""
+msgstr "URL połączenia"
 
 #. module: olap
 #: field:olap.schema,cube_ids:0
 msgid "Cubes"
-msgstr ""
+msgstr "Kostki"
 
 #. module: olap
 #: view:olap.schema:0
 msgid "ReConfigure Structure"
-msgstr ""
+msgstr "Rekonfiguruj strukturę"
 
 #. module: olap
 #: field:olap.application,field_ids:0
 msgid "Fields"
-msgstr ""
+msgstr "Pola"
 
 #. module: olap
 #: selection:olap.measure,agregator:0
 msgid "Average"
-msgstr ""
+msgstr "Średnia"
 
 #. module: olap
 #: view:bi.load.db.wizard:0
 msgid "Load Database Tables"
-msgstr ""
+msgstr "Wczytaj tabele bazy danych"
 
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
 msgid "Olap Hierarchy"
-msgstr ""
+msgstr "Hierarchia OLAP"
 
 #. module: olap
 #: field:olap.cube.table.line,cube_table_id:0
 msgid "Cube Table"
-msgstr ""
+msgstr "Tabela kostki"
 
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_bi
@@ -1279,12 +1298,12 @@ msgstr ""
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
 msgid "Databases"
-msgstr ""
+msgstr "Bazy danych"
 
 #. module: olap
 #: field:olap.hierarchy,name:0
 msgid "Hierarchy name"
-msgstr ""
+msgstr "Nazwa hierarchii"
 
 #. module: olap
 #: model:ir.module.module,description:olap.module_meta_information
@@ -1293,21 +1312,24 @@ msgid ""
 "    Base module to manage Olap schemas. Cube designer.\n"
 "    "
 msgstr ""
+"\n"
+"    Podstawowy moduł do zarządzania schematami OLAP. Projektant kostek.\n"
+"    "
 
 #. module: olap
 #: view:olap.cube.table:0
 msgid "Joined Tables"
-msgstr ""
+msgstr "Połączone tabele"
 
 #. module: olap
 #: field:olap.schema,loaded:0
 msgid "Loading Datastructure"
-msgstr ""
+msgstr "Wczytywanie struktury danych"
 
 #. module: olap
 #: view:olap.cube.table:0
 msgid "Joined Table"
-msgstr ""
+msgstr "Połączone tabele"
 
 #. module: olap
 #: selection:olap.fact.database,type:0
@@ -1317,23 +1339,23 @@ msgstr ""
 #. module: olap
 #: wizard_view:olap.query.logs.clear,init:0
 msgid " To Load Data"
-msgstr ""
+msgstr " Dane do wczytania"
 
 #. module: olap
 #: field:olap.hierarchy,sequence:0
 #: field:olap.level,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Numeracja"
 
 #. module: olap
 #: model:ir.ui.menu,name:olap.menu_bi_conf_tools
 msgid "Tools"
-msgstr ""
+msgstr "Narzędzia"
 
 #. module: olap
 #: field:olap.schema,state:0
 msgid "Schema State"
-msgstr ""
+msgstr "Stan schematu"
 
 #. module: olap
 #: selection:olap.measure,datatype:0
@@ -1345,18 +1367,18 @@ msgstr ""
 #: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
 #: view:olap.query.logs:0
 msgid "All Logs"
-msgstr ""
+msgstr "Wszystkie logi"
 
 #. module: olap
 #: selection:olap.fact.database,connection_type:0
 #: field:olap.parameters.config.wizard,host_port:0
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #. module: olap
 #: view:olap.fact.database:0
 msgid "Fact database"
-msgstr ""
+msgstr "Baza danych faktów"
 
 #. module: olap
 #: model:ir.module.module,shortdesc:olap.module_meta_information
@@ -1366,36 +1388,36 @@ msgstr ""
 #. module: olap
 #: field:olap.database.columns,name:0
 msgid "Column Name"
-msgstr ""
+msgstr "Nazwa kolumny"
 
 #. module: olap
 #: field:olap.database.tables,table_db_name:0
 msgid "Table Name"
-msgstr ""
+msgstr "Nazwa tabeli"
 
 #. module: olap
 #: wizard_view:olap.application.configuration,configure:0
 msgid "Auto Configure"
-msgstr ""
+msgstr "Automatyczna konfiguracja"
 
 #. module: olap
 #: field:olap.schema,configure:0
 msgid "Configuring Datastructure"
-msgstr ""
+msgstr "Konfigurowanie struktury danych"
 
 #. module: olap
 #: model:ir.actions.wizard,name:olap.bi_load_configuration_table
 msgid "Open Configuration"
-msgstr ""
+msgstr "Otwórz konfigurację"
 
 #. module: olap
 #: view:olap.schema:0
 msgid "Configure Automatically "
-msgstr ""
+msgstr "Konfiguruj automatycznie "
 
 #. module: olap
 #: model:ir.actions.wizard,name:olap.bi_clear_logs
 #: model:ir.ui.menu,name:olap.menu_bi_clear_logs
 #: wizard_button:olap.query.logs.clear,init,ok:0
 msgid "Clear Logs"
-msgstr ""
+msgstr "Wyczyść logi"
diff --git a/addons/olap/olap.py b/addons/olap/olap.py
index 317a56dd7c3..7e5198abb6d 100644
--- a/addons/olap/olap.py
+++ b/addons/olap/olap.py
@@ -30,6 +30,9 @@ from osv import osv
 from osv import fields, osv
 import netsvc
 import cube
+import os
+import tools
+import base64
 from cube import levels
 
 
@@ -1078,7 +1081,7 @@ class olap_query_logs(osv.osv):
     _description = "Olap query logs"
 
     _columns = {
-        'user_id': fields.many2one('res.users', 'Tiny ERP User'),
+        'user_id': fields.many2one('res.users', 'OpenERP SA User'),
         'query': fields.text('Query', required = True),
         'time': fields.datetime('Time', required = True),
         'result_size': fields.integer('Result Size', readonly = True),
@@ -2128,16 +2131,34 @@ class olap_parameters_config_wizard(osv.osv_memory):
                Word(alphanums + "_" + " ").suppress()
         return s_p.parseString(aid.url)[1]
 
+    def _get_image(self, cr, uid, context=None):
+        path = os.path.join('base','res','config_pixmaps/1.png')
+        file_data = tools.file_open(path,'rb').read()
+        return base64.encodestring(file_data)
+
+    def _progress(self, cr, uid, context=None):
+        total = self.pool.get('ir.actions.todo')\
+            .search_count(cr, uid, [], context)
+        open = self.pool.get('ir.actions.todo')\
+            .search_count(cr, uid, [('state','<>','open')], context)
+        if total:
+            return round(open*90./total)
+        return 100.
+
     _columns = {
         'host_name': fields.char('Server Name', size = 64, help = "Put here the server address or IP \
                 Put localhost if its not clear.", required = True),
         'host_port': fields.char('Port', size = 4, help = "Put the port for the server. Put 8080 if \
                 its not clear.", required = True),
+        'config_logo': fields.binary('Image', readonly=True),
+        'progress': fields.float('Configuration Progress', readonly=True),
             }
 
     _defaults = {
         'host_name': _get_host,
         'host_port': _get_port,
+        'progress': _progress,
+        'config_logo': _get_image,
         }
 
     def action_cancel(self, cr, uid, ids, conect = None):
diff --git a/addons/olap_crm/__openerp__.py b/addons/olap_crm/__openerp__.py
index 940355ab49c..8bef559c12e 100644
--- a/addons/olap_crm/__openerp__.py
+++ b/addons/olap_crm/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,14 +15,14 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 {
     "name" : "olap_crm",
     "version" : "0.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "depends" : ["olap"],
     "category" : "Generic Modules/Olap",
diff --git a/addons/olap_extract/__openerp__.py b/addons/olap_extract/__openerp__.py
index 6e44d5e7e43..b1cd0f6d43f 100644
--- a/addons/olap_extract/__openerp__.py
+++ b/addons/olap_extract/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,14 +15,14 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 {
     "name" : "Module to extracts the schema structure",
     "version" : "0.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "depends" : ["olap"],
     "category" : "Generic Modules/Olap",
diff --git a/addons/olap_extract/wizard_olap_extract.py b/addons/olap_extract/wizard_olap_extract.py
index e71d2cb7fe6..75e546bd7b6 100644
--- a/addons/olap_extract/wizard_olap_extract.py
+++ b/addons/olap_extract/wizard_olap_extract.py
@@ -128,7 +128,7 @@ class wizard_olap_extract(wizard.interface):
         _terp= """{
                 "name" : "%(modulename)s",
                 "version" : "0.1",
-                "author" : "Tiny",
+                "author" : "OpenERP SA",
                 "website" : "http://tinyerp.com/",
                 "depends" : ["olap"],
                 "category" : "Generic Modules/Others",
diff --git a/addons/olap_sale/__openerp__.py b/addons/olap_sale/__openerp__.py
index d94e6ee956d..11c2bd5ecbe 100644
--- a/addons/olap_sale/__openerp__.py
+++ b/addons/olap_sale/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Load Sale Module data in Olap Tables",
     "version" : "0.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "depends" : ["olap"],
     "category" : "Generic Modules/Olap",
diff --git a/addons/partner_geo_assign/__openerp__.py b/addons/partner_geo_assign/__openerp__.py
index 2d18649236e..ccfe6ba7c45 100644
--- a/addons/partner_geo_assign/__openerp__.py
+++ b/addons/partner_geo_assign/__openerp__.py
@@ -26,12 +26,14 @@
     'category': 'Generic Modules/Production',
     'description': """
 This is the module used by OpenERP SA to redirect customers to his partners,
-based on geolocalisation.
+based on geolocalization.
     """,
     'author': 'OpenERP SA',
     'depends': ['crm'],
-    'update_xml': ['res_partner_view.xml'],
-    'demo_xml': [],
+    'data': [
+        'res_partner_view.xml',
+        'crm_lead_view.xml',
+        ],
     'installable': True,
     'active': False,
     'certificate': False,
diff --git a/addons/partner_geo_assign/crm_lead_view.xml b/addons/partner_geo_assign/crm_lead_view.xml
new file mode 100644
index 00000000000..dfd7c3bef1a
--- /dev/null
+++ b/addons/partner_geo_assign/crm_lead_view.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record id="view_crm_opportunity_geo_assign_form" model="ir.ui.view">
+            <field name="name">crm.lead.geo_assign.inherit</field>
+            <field name="model">crm.lead</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//notebook[last()]/page[@string='Assignation']/group[@name='partner_assign_group']" position="after">
+                        <group name="geo_assign_group" col="5" colspan="4">
+                            <separator string="Geo Assignation" colspan="5"/>
+                            <field name="partner_latitude"/>
+                            <field name="partner_longitude"/>
+                            <group colspan="1" col="1">
+                                <button string="Geo Assign" name="assign_partner" type="object" colspan="1"
+                                    icon="gtk-apply"/>
+                            </group>
+                        </group>
+                    </xpath>
+                    <xpath expr="//notebook[last()]/page[@string='Assignation']/group[@name='partner_assign_group']/field[@name='partner_assigned_id']" position="attributes">
+                        <attribute name="domain">[('partner_weight','&gt;',0)]</attribute>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/partner_geo_assign/partner_geo_assign.py b/addons/partner_geo_assign/partner_geo_assign.py
index 97bca0b1073..d53aa461db6 100644
--- a/addons/partner_geo_assign/partner_geo_assign.py
+++ b/addons/partner_geo_assign/partner_geo_assign.py
@@ -39,14 +39,14 @@ def geo_find(addr):
     except Exception, e:
         raise osv.except_osv(_('Network error'), 
                              _('Could not contact geolocation servers, please make sure you have a working internet connection (%s)') % e)
-    
+
 
 class res_partner(osv.osv):
     _inherit = "res.partner"
     _columns = {
         'partner_latitude': fields.float('Geo Latitude'),
         'partner_longitude': fields.float('Geo Longitude'),
-        'date_assign': fields.date('Assignation Date'),
+        'date_localization': fields.date('Geo Localization Date'),
         'partner_weight': fields.integer('Weight',
             help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"),
     }
@@ -58,13 +58,13 @@ class res_partner(osv.osv):
             if not partner.address:
                 continue
             part = partner.address[0]
-            addr = ', '.join(filter(None, [part.street, part.street2, (part.zip or '')+' '+(part.city or ''), part.state_id and part.state_id.name, part.country_id and part.country_id.name]))
+            addr = ', '.join(filter(None, [part.street, (part.zip or '')+' '+(part.city or ''), part.state_id and part.state_id.name, part.country_id and part.country_id.name]))
             result = geo_find(addr.encode('utf8'))
             if result:
                 self.write(cr, uid, [partner.id], {
                     'partner_latitude': result[0],
                     'partner_longitude': result[1],
-                    'date_assign': time.strftime('%Y-%m-%d')
+                    'date_localization': time.strftime('%Y-%m-%d')
                 }, context=context)
         return True
 res_partner()
@@ -74,62 +74,80 @@ class crm_lead(osv.osv):
     _columns = {
         'partner_latitude': fields.float('Geo Latitude'),
         'partner_longitude': fields.float('Geo Longitude'),
-        'partner_assigned_id': fields.many2one('res.partner','Assigned Partner'),
-        'date_assign': fields.date('Assignation Date')
     }
-    def forward_to_partner(self, cr, uid, ids, context=None):
-        fobj = self.pool.get('crm.lead.forward.to.partner')
-        for lead in self.browse(cr, uid, ids, context=context):
-            context = {'active_id': lead.id, 'active_ids': [lead.id], 'active_model': 'crm.lead'}
-            if lead.partner_assigned_id:
-                email = False
-                if lead.partner_assigned_id.address:
-                    email = lead.partner_assigned_id.address[0].email
-                if not email:
-                    raise osv.except_osv(_('Error !'), _('No email on the partner assigned to this opportunity'))
-
-                values = fobj.default_get(cr, uid, ['name', 'email_from'], context=context)
-                if not values.get('email_from'):
-                    raise osv.except_osv(_('Error !'), _('Please set an email address in your user preferences'))
-                values.update({
-                    'history': 'whole',
-                    'email_to': email,
-                    'message': fobj._get_case_history(cr, uid, 'whole', lead.id, context) or False,
-                    })
-                forward = fobj.create(cr, uid, values, context)
-                fobj.action_forward(cr, uid, [forward], context)
-            else:
-                raise osv.except_osv(_('Error !'), _('No partner assigned to this opportunity'))
-        return True
 
     def assign_partner(self, cr, uid, ids, context=None):
         ok = False
         for part in self.browse(cr, uid, ids, context=context):
             if not part.country_id:
                 continue
-            addr = ', '.join(filter(None, [part.street, part.street2, (part.zip or '')+' '+(part.city or ''), part.state_id and part.state_id.name, part.country_id and part.country_id.name]))
+            addr = ', '.join(filter(None, [part.street, (part.zip or '')+' '+(part.city or ''), part.state_id and part.state_id.name, part.country_id and part.country_id.name]))
             result = geo_find(addr.encode('utf8'))
             if result:
                 self.write(cr, uid, [part.id], {
                     'partner_latitude': result[0],
                     'partner_longitude': result[1]
                 }, context=context)
+
+                # 1. first way: in the same country, small area
                 part_ids = self.pool.get('res.partner').search(cr, uid, [
                     ('partner_weight','>',0),
                     ('partner_latitude','>',result[0]-2), ('partner_latitude','<',result[0]+2),
-                    ('partner_longitude','>',result[1]-1.5), ('partner_longitude','<',result[1]+1.5)
+                    ('partner_longitude','>',result[1]-1.5), ('partner_longitude','<',result[1]+1.5),
+                    ('country', '=', part.country_id.id),
                 ], context=context)
+
+                # 2. second way: in the same country, big area
+                if not part_ids:
+                    part_ids = self.pool.get('res.partner').search(cr, uid, [
+                        ('partner_weight','>',0),
+                        ('partner_latitude','>',result[0]-4), ('partner_latitude','<',result[0]+4),
+                        ('partner_longitude','>',result[1]-3), ('partner_longitude','<',result[1]+3),
+                        ('country', '=', part.country_id.id),
+                    ], context=context)
+
+                # 3. third way: other countries, small area
+                if not part_ids:
+                    part_ids = self.pool.get('res.partner').search(cr, uid, [
+                        ('partner_weight','>',0),
+                        ('partner_latitude','>',result[0]-2), ('partner_latitude','<',result[0]+2),
+                        ('partner_longitude','>',result[1]-1.5), ('partner_longitude','<',result[1]+1.5)
+                    ], context=context)
+
+                # 4. fourth way: other countries, big area
                 if not part_ids:
                     part_ids = self.pool.get('res.partner').search(cr, uid, [
                         ('partner_weight','>',0),
                         ('partner_latitude','>',result[0]-4), ('partner_latitude','<',result[0]+4),
                         ('partner_longitude','>',result[1]-3), ('partner_longitude','<',result[1]+3)
                     ], context=context)
+
+                # 5. fifth way: anywhere in same country
+                if not part_ids:
+                    # still haven't found any, let's take all partners in the country!
+                    part_ids = self.pool.get('res.partner').search(cr, uid, [
+                        ('partner_weight','>',0),
+                        ('country', '=', part.country_id.id),
+                    ], context=context)
+
+                # 6. sixth way: closest partner whatsoever, just to have at least one result    
+                if not part_ids:
+                    # warning: point() type takes (longitude, latitude) as parameters in this order!
+                    cr.execute("""SELECT id, distance
+                                  FROM  (select id, (point(partner_longitude, partner_latitude) <-> point(%s,%s)) AS distance FROM res_partner
+                                  WHERE partner_longitude is not null
+                                        AND partner_latitude is not null
+                                        AND partner_weight > 0) AS d
+                                  ORDER BY distance LIMIT 1""", (result[1],result[0]))
+                    res = cr.dictfetchone()
+                    part_ids.append(res['id'])
+
                 total = 0
                 toassign = []
                 for part2 in self.pool.get('res.partner').browse(cr, uid, part_ids, context=context):
                     total += part2.partner_weight
                     toassign.append( (part2.id, total) )
+                random.shuffle(toassign) # avoid always giving the leads to the first ones in db natural order!
                 mypartner = random.randint(0,total)
                 for t in toassign:
                     if mypartner<=t[1]:
diff --git a/addons/partner_geo_assign/res_partner_view.xml b/addons/partner_geo_assign/res_partner_view.xml
index 26322f23495..f9310fdfbd0 100644
--- a/addons/partner_geo_assign/res_partner_view.xml
+++ b/addons/partner_geo_assign/res_partner_view.xml
@@ -1,33 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <record id="view_crm_opportunity_geo_assign_form" model="ir.ui.view">
-            <field name="name">crm.lead.geo_assign.inherit</field>
-            <field name="model">crm.lead</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook[last()]" position="inside">
-                    <page string="Geo Assignation">
-                        <field name="partner_assigned_id"/>
-                        <newline/>
-                        <field name="partner_latitude"/>
-                        <field name="partner_longitude"/>
-                        <field name="date_assign"/>
-                        <label string="" colspan="1"/>
-                        <group colspan="1" col="2">
-                            <button string="Geo Assign" name="assign_partner" type="object" colspan="1"
-                                icon="gtk-apply"/>
-                            <button string="Forward"
-                                name="forward_to_partner" attrs="{'invisible':[('partner_assigned_id','=',False)]}"
-                                icon="gtk-apply"
-                                type="object"/>
-                        </group>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-
         <record id="view_crm_partner_geo_form" model="ir.ui.view">
             <field name="name">res.partner.geo.inherit</field>
             <field name="model">res.partner</field>
@@ -35,7 +8,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="inside">
-                    <page string="Geo Location">
+                    <page string="Geo Localization">
                         <field name="partner_weight"/>
                         <label string="" colspan="1"/>
                         <button
@@ -46,11 +19,10 @@
                         <newline/>
                         <field name="partner_latitude"/>
                         <field name="partner_longitude"/>
-                        <field name="date_assign"/>
+                        <field name="date_localization"/>
                     </page>
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index 2d195b3d4a5..93b601d6669 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -22,7 +22,6 @@
 
 import pos
 import account_bank_statement
-import pos_account_bank_statement
 import wizard
 import report
 
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 68d3bd85d8d..feaa797aeb5 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -35,7 +35,7 @@ Main features :
  - Allow to refund former sales.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['sale', 'delivery'],
     'init_xml': [],
 
@@ -67,6 +67,7 @@ Main features :
        # 'pos_wizard.xml',
         'pos_view.xml',
         'report/report_pos_order_view.xml',
+        'report/report_cash_register_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
         'pos_data.xml',
@@ -76,7 +77,7 @@ Main features :
         'statement_data.xml',
     ],
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
-    'test':['test/pos_test.yml',],
+#    'test':['test/pos_test.yml',],
     'installable': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index e9ebbe2ef56..5512f57f50a 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -20,13 +20,13 @@
 #
 ##############################################################################
 
-from osv import osv, fields
 import time
+from osv import osv
+from osv import fields
 from mx import DateTime
 from decimal import Decimal
 from tools.translate import _
 
-
 class account_journal(osv.osv):
 
     _inherit = 'account.journal'
@@ -34,230 +34,66 @@ class account_journal(osv.osv):
         'auto_cash': fields.boolean('Automatic Opening', help="This field authorize the automatic creation of the cashbox"),
         'special_journal':fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"),
         'check_dtls': fields.boolean('Check Details', help="This field authorize Validation of Cashbox without checking ending details"),
-        'statement_sequence_id': fields.many2one('ir.sequence', 'Statement Sequence', \
-            help="The sequence used for statement numbers in this journal."),
-        }
+        'journal_users': fields.many2many('res.users','pos_journal_users','journal_id','user_id','Users'),
+    }
     _defaults = {
         'check_dtls': lambda *a:True,
         'auto_cash': lambda *a:True,
-        }
+    }
 account_journal()
 
-
-class singer_statement(osv.osv):
-    
-    """ Singer Statements """
-    
-    _name = 'singer.statement'
-    _description = 'Statement'
-
-    def _sub_total(self, cr, uid, ids, name, arg, context=None):
-       
-        """ Calculates Sub total"
-        @param name: Names of fields.
-        @param arg: User defined arguments
-        @return: Dictionary of values.
-        """
-        res = {}
-        for obj in self.browse(cr, uid, ids):
-            res[obj.id] = obj.pieces * obj.number
-        return res
-
-    def on_change_sub(self, cr, uid, ids, pieces, number,*a):
-
-        """ Calculates Sub total on change of number
-        @param pieces: Names of fields.
-        @param number:
-        """           
-        sub=pieces*number
-        return {'value':{'subtotal': sub or 0.0}}
-
-    _columns = {
-          'pieces': fields.float('Values', digits=(16,2)),
-          'number': fields.integer('Number'),
-          'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float',digits=(16,2)),
-          'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
-          'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
-     }
-
-singer_statement()
-
-class account_bank_statement(osv.osv):
+class account_cash_statement(osv.osv):
     
     _inherit = 'account.bank.statement'
-    
-    def _get_starting_balance(self, cr, uid, ids, name, arg, context=None):
 
-        """ Find starting balance  "
-        @param name: Names of fields.
-        @param arg: User defined arguments
-        @return: Dictionary of values.
-        """          
-        res ={}
-        for statement in self.browse(cr, uid, ids):
-            amount_total=0.0
-            for line in statement.starting_details_ids:
-                amount_total+= line.pieces * line.number
-            res[statement.id]=amount_total
-        return res
+    def _equal_balance(self, cr, uid, ids, statement, context={}):
 
-    def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
-
-        """ Find encoding total of statements "
-        @param name: Names of fields.
-        @param arg: User defined arguments
-        @return: Dictionary of values.
-        """              
-        res2={}
-        for statement in self.browse(cr, uid, ids):
-            encoding_total=0.0
-            for line in statement.line_ids:
-               encoding_total+= line.amount
-            res2[statement.id]=encoding_total
-        return res2
-
-    def _default_journal_id(self, cr, uid, context={}):
-
-        """ To get default journal for the object" 
-        @param name: Names of fields.
-        @return: journal 
-        """  
-        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-        journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('auto_cash','=',False), ('company_id', '=', company_id)])
-        if journal:
-            return journal[0]
-        else:
+        if not statement.journal_id.check_dtls:
+            return True
+        
+        if statement.journal_id.check_dtls and (statement.balance_end != statement.balance_end_cash):
             return False
+        else:
+            return True            
+    
+    def _user_allow(self, cr, uid, ids, statement, context={}):
+        res = False
+        uids = []
+        for user in statement.journal_id.journal_users:
+            uids.append(user.id)
+        
+        if uid in uids:
+            res = True
+      
+        return res
+    
+account_cash_statement()
 
+class account_bank_statement_line(osv.osv):
+    
+    def _default_company(self, cr, uid, context={}):
+        """ To get default company for the object"
+        @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 bank statement ids
+        @param context: A standard dictionary for contextual values 
+        @return: company 
+        """          
+        
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if user.company_id:
+            return user.company_id.id
+        
+        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+    
+    _inherit = 'account.bank.statement.line'
     _columns = {
-          'journal_id': fields.many2one('account.journal', 'Journal', required=True),
-          'balance_start': fields.function(_get_starting_balance, method=True, string='Starting Balance', type='float',digits=(16,2)),
-         # 'balance_start': fields.float('Starting Balance',digits=(16,2)),
-         # 'balance_end': fields.float('Balance',digits=(16,2)),
-          'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirm'),('open','Open')],
-                                    'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
-          'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Total of Entry encoding"),
-          'date':fields.datetime("Opening Date"),
-          'closing_date':fields.datetime("Closing Date"),
-          'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Starting Details'),
-          'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Ending Details'),
-          'name': fields.char('Name', size=64, required=True, readonly=True),
-
+        'company_id':fields.many2one('res.company', 'Company', required=True),
     }
     _defaults = {
-          'state': lambda *a: 'draft',
-          'name': lambda *a: '/',
-          'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
-          'journal_id': _default_journal_id,
-
-         }
-
-    def create(self, cr, uid, vals, context=None):
-        
-        company_id = vals and vals.get('company_id',False)
-        if company_id:
-            open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
-            if open_jrnl:
-                raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
-            if 'starting_details_ids' in vals:
-                vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
-                for i in starting_details_ids:
-                    if i and i[0] and i[1]:
-                        i[0], i[1] = 0, 0
-        res = super(account_bank_statement, self).create(cr, uid, vals, context=context)
-        return res
-
-    def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None):
-        
-        """ Changes balance start and starting details if journal_id changes" 
-        @param statement_id: Changed statement_id
-        @param journal_id: Changed journal_id
-        @return:  Dictionary of changed values
-        """  
-        id_s=[]
-        if not journal_id:
-            return {'value': {'balance_start': 0.0}}
-        balance_start=0.0
-        cash_obj = self.pool.get('singer.statement')
-        statement_obj = self.pool.get('account.bank.statement')
-        cursor.execute("Select a.id from account_bank_statement a where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
-        res2=cursor.fetchone()
-        res2=res2 and res2[0] or None
-        if res2:
-            statmt_id=statement_obj.browse(cursor,user,res2)
-            check_det=statmt_id.journal_id.check_dtls
-            if not check_det:
-                balance_start=statmt_id.balance_end_real or 0.0
-                return {'value': {'balance_start': balance_start}}
-        cursor.execute("Select a.id from account_bank_statement a, singer_statement s where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
-        res1=cursor.fetchone()
-        res1=res1 and res1[0] or None
-        if res1:
-            cursor.execute("Select sum(ss.pieces*ss.number),ss.ending_id from singer_statement ss, account_bank_statement s where ss.ending_id=s.id and s.journal_id=%d and s.user_id=%d and s.id=%d group by ss.ending_id,s.id order by s.id desc"%(journal_id,user, res1))
-            res = cursor.fetchone()
-            balance_start = res and res[0] or 0.0
-            cash_end=res and res[1] or None
-            id_s=statement_obj.browse(cursor,user,cash_end).ending_details_ids
-        new=[]
-        if id_s:
-            for s in id_s:
-                new.append(s.id)
-        return {'value': {'balance_start': balance_start, 'starting_details_ids':new}}
-
-    def button_open(self, cr, uid, ids, context=None):
-        
-        """ Changes statement state to Running.
-        @return: True 
-        """       
-        obj_inv = self.browse(cr, uid, ids)[0]
-        s_id=obj_inv.journal_id
-        if s_id.statement_sequence_id:
-            s_id=s_id.id
-            number = self.pool.get('ir.sequence').get_id(cr, uid, s_id)
-        else:
-            number = self.pool.get('ir.sequence').get(cr, uid,
-                            'account.bank.statement')
-
-        self.write(cr, uid, ids, {'date':time.strftime("%Y-%m-%d %H:%M:%S"), 'state':'open', 'name':number})
-        return True
-
-    def button_confirm(self, cr, uid, ids, context={}):
-        
-        """ Check the starting and ending detail of  statement 
-        @return: True 
-        """         
-        val = 0.0
-        val2 = 0.0
-        val_statement_line = 0.0
-        diff = self.pool.get('res.users').browse(cr,uid,uid).company_id.max_diff or 0.0
-        for statement in self.browse(cr, uid, ids):
-            bal = statement.balance_end
-            bal_st=statement.balance_start
-            for st in statement.line_ids:
-                val_statement_line += st.amount
-            for stat in statement.starting_details_ids:
-                val2 += stat.subtotal
-            for stat in statement.ending_details_ids:
-                val += stat.subtotal
-            if statement.journal_id.check_dtls:
-                if Decimal(str(val)).quantize(Decimal('.001')) != (Decimal(str(val_statement_line)) + Decimal(str(val2))).quantize(Decimal('.001')):
-                    raise osv.except_osv(_('Invalid action !'), _(' You can not confirm your cashbox, Please enter ending details, missing value matches to "%s"')%(abs(Decimal(str(val))-(Decimal(str(val_statement_line))+Decimal(str(val2))))))
-
-            self.write(cr, uid, statement.id, {'balance_end_real':Decimal(str(val_statement_line))+Decimal(str(val2)),'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
-           # self.write(cr, uid, statement.id, {'balance_end_real':bal_st+val_statement_line,'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
-        return  super(account_bank_statement, self).button_confirm(cr, uid, ids, context={})
-    
-    def button_cancel(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'draft'}, context=context)
-
-account_bank_statement()
-
-#class singer_account_bank_statement_line(osv.osv):
-#    _inherit = 'account.bank.statement.line'
-#    _columns = {
-#           'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),
-#     }
-#
-#singer_account_bank_statement_line()
-
+        'company_id': _default_company,
+    }
+account_bank_statement_line()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 6e66b220601..613dce7b290 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -287,8 +287,8 @@ class pos_order(osv.osv):
         'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date',  store=True),
         'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date',  store=True),
         'date_validity': fields.date('Validity Date', required=True),
-        'user_id': fields.many2one('res.users', 'Connected Salesman', readonly=True),
-        'user_salesman_id': fields.many2one('res.users', 'Salesman', required=True),
+        'user_id': fields.many2one('res.users', 'Connected Salesman'),
+        'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True),
         'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
         'amount_tax': fields.function(_amount_all, method=True, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'amount_total': fields.function(_amount_total, method=True, string='Total'),
@@ -298,7 +298,7 @@ class pos_order(osv.osv):
         'price_type': fields.selection([
             ('tax_excluded','Tax excluded')
         ], 'Price method', required=True),
-        'statement_ids': fields.one2many('account.bank.statement.line','pos_statement_id','Payments'),
+        'statement_ids': fields.one2many('account.bank.statement.line','pos_statement_id','Payments',states={'draft': [('readonly', False)]},readonly=True),
         'payments': fields.one2many('pos.payment', 'order_id', 'Order Payments', states={'draft': [('readonly', False)]}, readonly=True),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
         'partner_id': fields.many2one( 'res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
@@ -311,8 +311,7 @@ class pos_order(osv.osv):
         'pickings': fields.one2many('stock.picking', 'pos_order', 'Picking', readonly=True),
         'picking_id': fields.many2one('stock.picking', 'Last Output Picking', readonly=True),
         'first_name': fields.char('First Name', size=64),
-        'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),
-            ('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
+#        'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
         'note': fields.text('Internal Notes'),
         'nb_print': fields.integer('Number of Print', readonly=True),
         'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, ),
@@ -355,7 +354,7 @@ class pos_order(osv.osv):
         'sale_manager': lambda self, cr, uid, context: uid,
         'state': lambda *a: 'draft',
         'price_type': lambda *a: 'tax_excluded',
-        'state_2': lambda *a: 'to_verify',
+#        'state_2': lambda *a: 'to_verify',
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order'),
         'date_order': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'date_validity': lambda *a: (DateTime.now() + DateTime.RelativeDateTime(months=+6)).strftime('%Y-%m-%d'),
@@ -558,26 +557,26 @@ class pos_order(osv.osv):
             raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
         return True
 
-    def button_validate(self, cr, uid, ids, *args):
-
-        """ Check the access for the sale order  and update the date_validation
-        @return: True
-        """
-        res_obj = self.pool.get('res.company')
-        try:
-            part_company=res_obj.browse(cr,uid,uid) and res_obj.browse(cr,uid,uid).parent_id and res_obj.browse(cr,uid,uid).parent_id.id or None
-        except Exception, e:
-            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
-        if part_company:
-            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
-        for order in self.browse(cr, uid, ids):
-            if not order.date_validation:
-                cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
-                val=cr.fetchone()
-                val=val and val[0] or None
-                if val:
-                    cr.execute("Update pos_order set date_validation='%s', state_2 ='%s' where id = %d"%(val, 'accepted', order.id))
-        return True
+#    def button_validate(self, cr, uid, ids, *args):
+#
+#        """ Check the access for the sale order  and update the date_validation
+#        @return: True
+#        """
+#        res_obj = self.pool.get('res.company')
+#        try:
+#            part_company=res_obj.browse(cr,uid,uid) and res_obj.browse(cr,uid,uid).parent_id and res_obj.browse######(cr,uid,uid).parent_id.id or None
+#        except Exception, e:
+#            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
+#        if part_company:
+#            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
+#        for order in self.browse(cr, uid, ids):
+#            if not order.date_validation:
+#                cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
+#                val=cr.fetchone()
+#                val=val and val[0] or None
+#                if val:
+#                   cr.execute("Update pos_order set date_validation='%s', state_2 ='%s' where id = %d"%(val, 'accepted', order.id))
+#        return True
 
 
     def cancel_order(self, cr, uid, ids, context=None):
@@ -603,8 +602,8 @@ class pos_order(osv.osv):
         if not order.num_sale and data['num_sale']:
             self.write(cr,uid,order_id,{'num_sale': data['num_sale']})
         ids_new=[]
-        if order.invoice_wanted and not order.partner_id:
-            raise osv.except_osv(_('Error'), _('Cannot create invoice without a partner.'))
+#        if order.invoice_wanted and not order.partner_id:
+#            raise osv.except_osv(_('Error'), _('Cannot create invoice without a partner.'))
         args = {
             'amount': data['amount'],
             }
@@ -705,7 +704,7 @@ class pos_order(osv.osv):
         product_obj= self.pool.get('product.product')
         inv_ids = []
 
-        for order in self.browse(cr, uid, ids, context):
+        for order in self.pool.get('pos.order').browse(cr, uid, ids, context):
             curr_c = order.user_salesman_id.company_id
             if order.invoice_id:
                 inv_ids.append(order.invoice_id.id)
@@ -1072,8 +1071,8 @@ class pos_order_line(osv.osv):
             else:
                 res[line.id]=line.price_unit*line.qty
             res[line.id] = res[line.id] + tax_amount
-
         return res
+
     def _amount_line(self, cr, uid, ids, field_name, arg, context):
         res = {}
 
@@ -1107,7 +1106,8 @@ class pos_order_line(osv.osv):
     def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
         price = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
         self.write(cr,uid,ids,{'price_unit':price})
-        return {'value': {'price_unit': price}, 'qty': 1}
+        pos_stot = (price * qty)
+        return {'value': {'price_unit': price,'price_subtotal_incl': pos_stot}}
 
     def onchange_subtotal(self, cr, uid, ids, discount, price, pricelist,qty,partner_id, product_id,*a):
         prod_obj = self.pool.get('product.product')
@@ -1121,6 +1121,11 @@ class pos_order_line(osv.osv):
             return {'value':{'discount':disc, 'price_unit':price_f}}
         return {}
 
+    def onchange_dis(self, cr, uid,ids,  qty, price_subtotal_incl, discount,*a):
+        price_sub = price_subtotal_incl
+        sub_total_discount = price_sub-(price_subtotal_incl*(discount*0.01))
+        return {'value': {'price_subtotal_incl':sub_total_discount}}    
+
     def onchange_ded(self, cr, uid,ids, val_ded,price_u,*a):
         pos_order = self.pool.get('pos.order.line')
         res_obj = self.pool.get('res.users')
@@ -1149,7 +1154,7 @@ class pos_order_line(osv.osv):
             else:
                 return {'value': {'notice':'Minimum Discount','price_ded':price*discount*0.01 or 0.0  }}
         else :
-            return {'value': {'notice':'No Discount', 'price_ded':price*discount*0.01 or 0.0 }}
+            return {'value': {'notice':'No Discount', 'price_ded':price*discount*0.01 or 0.0}}
     _columns = {
         'name': fields.char('Line Description', size=512),
         'company_id':fields.many2one('res.company', 'Company', required=True),
@@ -1176,6 +1181,17 @@ class pos_order_line(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
         }
 
+#    def _check_qty(self, cr, uid, ids):
+#        lines = self.browse(cr, uid, ids)
+#        for line in lines:
+#            if line.qty <= 0:
+#                return False
+#        return True
+
+#    _constraints = [
+#        (_check_qty, 'Order quantity cannot be negative or zero !', ['qty']),
+#    ]
+
     def create(self, cr, user, vals, context={}):
         if vals.get('product_id'):
             return super(pos_order_line, self).create(cr, user, vals, context)
diff --git a/addons/point_of_sale/pos_account_bank_statement.py b/addons/point_of_sale/pos_account_bank_statement.py
deleted file mode 100644
index 60924350014..00000000000
--- a/addons/point_of_sale/pos_account_bank_statement.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-import time
-import netsvc
-
-
-class account_bank_statement(osv.osv):
-    
-    _inherit = 'account.bank.statement'
-    _columns = {
-        'company_id':fields.many2one('res.company', 'Company', required=True),
-    }
-    _defaults = {
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-    }
-account_bank_statement()
-
-class account_bank_statement_line(osv.osv):
-    
-    def _default_company(self, cr, uid, context={}):
-
-        """ To get default company for the object"
-        
-        @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 bank statement ids
-        @param context: A standard dictionary for contextual values 
-        @return: company 
-        """          
-        
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if user.company_id:
-            return user.company_id.id
-        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
-    
-    _inherit = 'account.bank.statement.line'
-    _columns = {
-        'company_id':fields.many2one('res.company', 'Company', required=True),
-    }
-    _defaults = {
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-    }
-account_bank_statement_line()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 9f07816b48d..c3fe7f659d6 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -12,9 +12,9 @@
             <field name="arch" type="xml">
                 <form string="Sales Order POS">
                     <group col="6" colspan="4">
-                        <field name="user_salesman_id" />
+                        <!--field name="user_salesman_id" />
                         <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
-                        <field name="contract_number" groups="base.group_extended"/>
+                        <field name="contract_number" groups="base.group_extended"/> -->
 
                     </group>
                      <notebook colspan="4">
@@ -22,19 +22,20 @@
                             <field name="lines" colspan="4" nolabel="1">
                                 <tree string="Order lines" editable="bottom">
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275" />
-                                    <field name="qty" />
-                                    <field name="qty_rfd" groups="base.group_extended"/>
+                                    <field name="qty"/>
+                                    <!--<field name="qty" on_change="onchange_qty(qty,price_unit)"/>-->
+                                    <!--field name="qty_rfd" groups="base.group_extended"/-->
                                     <field name="discount" on_change="onchange_discount(discount,price_unit)" />
-                                    <field name="price_ded" on_change="onchange_ded(price_ded, price_unit)" />
+                                    <field name="price_ded" on_change="onchange_ded(price_ded, price_subtotal_incl,price_unit)" invisible="1"/>
                                     <field name="price_unit" readonly="1"/>
-                                    <field name="notice"/>
-                                    <field name="serial_number"/>
+                                    <field name="notice" on_change="onchange_dis(qty,price_subtotal_incl,discount)"/>
+                                    <!--field name="serial_number"/-->
                                     <field name="price_subtotal" />
-                                    <field name="price_subtotal_incl"/>
+                                    <field name="price_subtotal_incl" sum="Subtotal"/>
                                 </tree>
                                 <form string="Order lines" >
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275"/>
-                                    <field name="qty" />
+                                    <field name="qty"/>
                                     <field name="qty_rfd" groups="base.group_extended"/>
                                     <field name="discount" on_change="onchange_discount(discount,price_unit)" />
                                     <field name="price_ded" on_change="onchange_ded(price_ded, price_unit)" />
@@ -47,24 +48,24 @@
                             <group colspan="4" col="7">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
-                                <button name="%(action_pos_discount)d" string="D_iscount" icon="gtk-execute" type="action" states="draft"/>
-                                <button name="dummy_button" string="Compute" icon="gtk-execute" type="object" />
+                                <!--button name="%(action_pos_discount)d" string="D_iscount" type="action" states="draft"/>
+                                <button name="dummy_button" string="Compute" type="object" /-->
                             </group>
 
-                            <group colspan="4" col="9" groups="base.group_extended">
-                            <separator colspan="4" string="Validation of the Sale"/>
-                                <newline/>
-                                <field name="state_2" />
-                                <button name="button_validate"
-                                        string="Accept"
-                                        type="object"
-                                     icon="gtk-ok"
-                                    states="paid, draft"
-                                        attrs="{'invisible':[('state_2','=','accepted')]}"/>
-                              </group>
+<!--                            <group colspan="4" col="9" groups="base.group_extended">-->
+<!--                            <separator colspan="4" string="Validation of the Sale"/>-->
+<!--                                <newline/>-->
+<!--                                <field name="state_2" />-->
+<!--                                <button name="button_validate"-->
+<!--                                        string="Accept"-->
+<!--                                        type="object"-->
+<!--                                     icon="gtk-ok"-->
+<!--                                    states="paid, draft"-->
+<!--                                        attrs="{'invisible':[('state_2','=','accepted')]}"/>-->
+<!--                              </group>-->
                             <separator colspan="4" string="Actions"/>
                             <group colspan="4" col="6">
-                                <field name="state"/>
+                                <field name="state" />
                                 <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" />
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                                 <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
@@ -76,11 +77,12 @@
                         <page string="Order and Payment">
                             <group colspan="2" col="2" name="Type">
                                 <separator string="Order Information" colspan="4"/>
+                                <field name="user_salesman_id" />
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="shop_id" widget="selection"  />
                                 <field name="name"/>
-                                <field name="user_id" />
-                                <field name="sale_manager" />
+                                <field name="user_id" string="Salesman"/>
+                                <!--field name="sale_manager" /-->
                                 <field name="price_type" />
                             </group>
                             <group colspan="2" col="2" name="Type">
@@ -91,13 +93,14 @@
                                 <field name="type_rec"  colspan="4"/>
                             </group>
                             <group colspan="4">
-                                <separator string="Invoicing" colspan="4"/>
-                                <field name="sale_journal" domain="[('type','=','sale'),('company_id','=',company_id)]"/>
-                                <field name="pricelist_id" domain="[('type','=','sale')]"/>
-                                <field name="invoice_id"/>
-                                <group colspan="2" col="4">
-                                    <button name="invoice" icon="gtk-execute" string="Create _Invoice" states="paid"/>
-                                </group>
+<!--                                <separator string="Invoicing" colspan="4"/>-->
+                                <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)" invisible="1"/>
+                                <field name="sale_journal" domain="[('type','=','sale')]" widget="selection" invisible="1"/>
+                                <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection" invisible="1"/>
+<!--                                <field name="invoice_id"/>-->
+<!--                                <group colspan="2" col="4">-->
+<!--                                    <button name="invoice" icon="gtk-execute" string="Create _Invoice" states="paid"/>-->
+<!--                                </group>-->
                             </group>
 
                             <field name="statement_ids" colspan="4" nolabel="1">
@@ -172,9 +175,9 @@
             </field>
         </record>
 
-        <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
+        <menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
         <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
-        <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="29" />
+        <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="15" />
 
         <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale_product" sequence="2" name="Products"/>
 
@@ -186,7 +189,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
-            <field name="domain">['|',('state_2','=','to_verify'),('state','=','advance')]</field>
+            <field name="domain">['|',('state','=','advance')]</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_pos_order_filter"/>
 
@@ -743,7 +746,7 @@
         </record>
 
         <menuitem name="Configuration" parent="menu_point_root"
-            id="menu_point_config_product" sequence="6"/>
+            id="menu_point_config_product" sequence="25"/>
 
         <record model="ir.actions.act_window" id="action_product_input">
             <field name="name">Products</field>
@@ -795,16 +798,16 @@
                     action="action_product_output"
                     id="products_for_output_operations"/>
 
-        <menuitem name="Register Management" parent="menu_point_root"
-            id="menu_point_config" sequence="3"/>
+<!--        <menuitem name="Register Management" parent="menu_point_root"-->
+<!--            id="menu_point_config" sequence="4"/>-->
         <menuitem
-            name="Input Operations" parent="menu_point_config"
+            name="Input Operations" parent="menu_point_of_sale"
             string="Refloat"
             action="action_box_entries"
-            id="menu_wizard_enter_jrnl" sequence="3" />
+            id="menu_wizard_enter_jrnl" sequence="2" />
 
         <menuitem
-            name="Output Operations" parent="menu_point_config"
+            name="Output Operations" parent="menu_point_of_sale"
             string="Refloat"
             action="action_box_out"
             id="menu_wizard_enter_jrnl2" sequence="3" />
@@ -860,7 +863,7 @@
         </record>
 
         <!--  Miscelleanous Operations/Reporting -->
-        <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="30"/>
+        <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="20"/>
         <menuitem name="Registers" parent="menu_point_rep" id="menu_point_report_register" sequence="0" />
         <menuitem name="Sales" parent="menu_point_rep" id="menu_point_report_sale" sequence="1" />
 
diff --git a/addons/point_of_sale/report/__init__.py b/addons/point_of_sale/report/__init__.py
index 9f0f94bb816..795cf348da1 100644
--- a/addons/point_of_sale/report/__init__.py
+++ b/addons/point_of_sale/report/__init__.py
@@ -38,5 +38,6 @@ import pos_receipt_with_remboursment
 import pos_receipt_without_remboursment
 import point_of_sale_report
 import report_pos_order
+import report_cash_register
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/report_cash_register.py b/addons/point_of_sale/report/report_cash_register.py
new file mode 100644
index 00000000000..a7eb4af191c
--- /dev/null
+++ b/addons/point_of_sale/report/report_cash_register.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 tools
+from osv import fields,osv
+
+class report_cash_register(osv.osv):
+    _name = "report.cash.register"
+    _description = "Point of Sale Cash Register Analysis"
+    _auto = False
+    _columns ={
+        'date': fields.date('Create Date', readonly=True),
+        'year': fields.char('Year', size=4),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),        
+        'state':fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],'State'), 
+        'journal_id': fields.many2one('account.journal', 'Journal'),
+        'balance_start': fields.float('Opening Balance'),
+        'balance_end_real': fields.float('Closing Balance'),
+    }
+    _order = 'date desc'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_cash_register')
+        cr.execute("""
+            create or replace view report_cash_register as (
+                select 
+                    min(s.id) as id,
+                    to_date(to_char(s.create_date, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,         
+                    s.user_id as user_id,
+                    s.journal_id as journal_id,
+                    s.state as state,
+                    s.balance_start as balance_start,
+                    s.balance_end_real as balance_end_real,
+                    to_char(s.create_date, 'YYYY') as year,
+                    to_char(s.create_date, 'MM') as month,
+                    to_char(s.create_date, 'YYYY-MM-DD') as day
+                from account_bank_statement as s where s.user_id=1    
+                group by       
+                        s.user_id,s.journal_id, s.balance_start, s.balance_end_real,s.state,to_char(s.create_date, 'dd-MM-YYYY'),
+                        to_char(s.create_date, 'YYYY'),
+                        to_char(s.create_date, 'MM'),
+                        to_char(s.create_date, 'YYYY-MM-DD'))""")
+
+report_cash_register()
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
new file mode 100644
index 00000000000..c1af53d0abc
--- /dev/null
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_report_cash_register_tree" model="ir.ui.view">
+	        <field name="name">report.cash.register.tree</field>
+	        <field name="model">report.cash.register</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Point of Sale Cash Register Analysis">
+	                <field name="date" invisible="1"/>
+	                <field name="user_id" invisible="1"/>
+	                <field name="state" invisible="1"/>
+	                <field name="year" invisible="1"/>
+	                <field name="month" invisible="1"/>
+	                <field name="day" invisible="1"/>
+	                <field name="journal_id" invisible="1"/>
+	                <field name="balance_start" />
+	                <field name="balance_end_real" />
+	            </tree>
+	        </field>
+        </record>
+
+        <record id="view_report_cash_register_search" model="ir.ui.view">
+	        <field name="name">report.cash.register.search</field>
+	        <field name="model">report.cash.register</field>
+	        <field name="type">search</field>
+	        <field name="arch" type="xml">
+	            <search string="Point of Sale Cash Register Analysis">
+	                <group>
+	                    <filter icon="terp-go-year" string="  365 Days  "
+	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+	                        help="Cash Analysis created last 365 days"/>
+	                    <filter icon="terp-go-month" string="   30 Days   "
+	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                        help="Cash Analysis created in last 30 days"/>
+	                    <filter icon="terp-go-week"
+	                         string="    7 Days    "
+	                         separator="1"
+	                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+	                         help="Cash Analysis created last 7 days"/>
+	                    <separator orientation="vertical"/>
+	                    <filter icon="terp-go-today"
+                             string="    Today    "
+                             name="today"
+                             separator="1"
+                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
+                             help="Cash Analysis created by today"/>	                    
+	                    <separator orientation="vertical"/>
+                        <filter icon="terp-document-new"
+                            string="Draft"
+                            domain="[('state','=',('draft'))]"/>
+	                    <filter icon="terp-camera_test"
+	                        string="Confirm"
+	                        domain="[('state','=',('confirm'))]"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" widget="selection">
+                        <filter icon="terp-personal"
+                            string="My Sales"
+                            help="My Sales"
+                            domain="[('user_id','=',uid)]"/>
+                        </field>
+                    </group>  
+                    <newline/>
+	                <group expand="0" string="Group By..." colspan="10" col="12">
+	                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+	                    <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+	                </group>                                  
+	            </search>
+	        </field>
+        </record>
+
+        <record id="action_report_cash_register_all" model="ir.actions.act_window">
+	        <field name="name">Cash Register Analysis</field>
+	        <field name="res_model">report.cash.register</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form</field>
+	        <field name="search_view_id" ref="view_report_cash_register_search"/>
+	        <field name="context">{'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+	    </record>
+
+	    <menuitem action="action_report_cash_register_all" id="menu_report_cash_register_all" parent="menu_point_rep"/>
+	</data>
+</openerp>
diff --git a/addons/point_of_sale/report/report_pos_order.py b/addons/point_of_sale/report/report_pos_order.py
index 42b2f3e9efb..51ac18d7cba 100644
--- a/addons/point_of_sale/report/report_pos_order.py
+++ b/addons/point_of_sale/report/report_pos_order.py
@@ -28,8 +28,6 @@ class report_pos_order(osv.osv):
     _auto = False
     _columns ={
         'date': fields.date('Date Order', readonly=True),
-        'date_validation': fields.date('Date Confirm', readonly=True),
-        'date_payment': fields.date('Date Confirm', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
@@ -41,8 +39,8 @@ class report_pos_order(osv.osv):
                                     ('advance','Advance'),
                                    ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced'), ('cancel', 'Cancel')],
                                   'State'),
-        'state_2': fields.function([('to_verify', 'To Verify'), ('accepted', 'Accepted'),
-            ('refused', 'Refused')], string='State'),
+#        'state_2': fields.function([('to_verify', 'To Verify'), ('accepted', 'Accepted'),
+#            ('refused', 'Refused')], string='State'),
         'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
         'price_total':fields.float('Total Price', readonly=True),
         'total_discount':fields.float('Total Discount', readonly=True),
@@ -50,53 +48,48 @@ class report_pos_order(osv.osv):
         'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
-        'product_qty':fields.float('# of Qty', readonly=True),
+        'product_qty':fields.integer('# of Qty', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal'),
-        'statement_journal_id': fields.many2one('account.journal','Cash Register'),
         'delay_validation': fields.integer('Delay Validation'),
         'delay_payment': fields.integer('Delay Payment'),
+        'date_validation': fields.date('Validation Date', required=True),
+        'date_payment': fields.date('Payment Date', required=True),
     }
     _order = 'date desc'
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_pos_order')
         cr.execute("""
             create or replace view report_pos_order as (
-                select el.*,
-
-                    (select 1) as nbr,
-                    to_date(to_char(po.date_order, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,
-                    po.date_validation as date_validation,
-                    po.date_payment as date_payment,
-                    to_char(po.date_order, 'YYYY') as year,
-                    to_char(po.date_order, 'MM') as month,
-                    to_char(po.date_order, 'YYYY-MM-DD') as day,
-                    (date(po.date_order)-date(po.date_validation)) as delay_validation,
-                    (date(po.date_order)-date(po.date_payment)) as delay_payment,
-                    po.partner_id as partner_id,
-                    po.state as state,
-                    po.state_2 as state_2,
-                    po.user_id as user_id,
-                    po.shop_id as shop_id,
-                    po.company_id as company_id,
-                    po.sale_journal as journal_id,
-                    aj.id as statement_journal_id
-
-                from
-                    pos_order as po,account_bank_statement_line absl,account_journal as aj,
-                    ( select pl.id as id,
-                        pl.product_id as product_id,
-                        pl.qty as product_qty,
-                        sum(pl.qty * pl.price_unit)- sum(pl.qty * pl.price_ded) as price_total,
-                        sum(pl.qty * pl.price_ded) as total_discount,
-                        ((sum(pl.qty * pl.price_unit)-sum(pl.qty * pl.price_ded))/sum(pl.qty)*count(pl.qty))::decimal(16,2) as average_price,
-                        pl.order_id
-                    from
-                        pos_order_line as pl
-                        left join product_template pt on (pt.id=pl.product_id)
-                    group by
-                        pl.id,pl.order_id, pl.qty,pl.product_id)  el
-                where po.id = el.order_id and absl.pos_statement_id = po.id and aj.name = absl.journal_id
-                )
-            """)
+                select
+                    min(l.id) as id,
+                    count(*) as nbr,
+                    to_date(to_char(s.date_order, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,
+                    sum(l.qty * u.factor) as product_qty,
+                    sum(l.qty * l.price_unit) as price_total,
+                    sum(l.qty * l.price_ded) as total_discount,
+                    (sum(l.qty*l.price_unit)/sum(l.qty * u.factor))::decimal(16,2) as average_price,
+                    sum(cast(to_char(date_trunc('day',s.date_validation) - date_trunc('day',s.date_order),'DD') as int)) as delay_validation,
+                    sum(cast(to_char(date_trunc('day',s.date_payment) - date_trunc('day',s.date_order),'DD') as int)) as delay_payment,
+                    to_char(s.date_order, 'YYYY') as year,
+                    to_char(s.date_order, 'MM') as month,
+                    to_char(s.date_order, 'YYYY-MM-DD') as day,
+                    s.partner_id as partner_id,
+                    s.state as state,
+                    s.user_id as user_id,
+                    s.shop_id as shop_id,
+                    s.company_id as company_id,
+                    s.sale_journal as journal_id,
+                    l.product_id as product_id,
+                    s.date_validation,
+                    s.date_payment
+                from pos_order_line as l
+                    left join pos_order s on (s.id=l.order_id)
+                    left join product_template pt on (pt.id=l.product_id)
+                    left join product_uom u on (u.id=pt.uom_id)
+                group by
+                    to_char(s.date_order, 'dd-MM-YYYY'),to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),
+                    to_char(s.date_order, 'YYYY-MM-DD'), s.partner_id,s.state,
+                    s.user_id,s.shop_id,s.company_id,s.sale_journal,l.product_id,s.date_validation,
+                    s.date_payment)""")
 
 report_pos_order()
diff --git a/addons/point_of_sale/report/report_pos_order_view.xml b/addons/point_of_sale/report/report_pos_order_view.xml
index 401ce6f8720..6bd136426e1 100644
--- a/addons/point_of_sale/report/report_pos_order_view.xml
+++ b/addons/point_of_sale/report/report_pos_order_view.xml
@@ -8,26 +8,25 @@
 	        <field name="arch" type="xml">
 	            <tree string="Point of Sale Analysis">
 	                <field name="date" invisible="1"/>
-	                <field name="date_validation" invisible="1"/>
-	                <field name="date_payment" invisible="1"/>
 	                <field name="user_id" invisible="1"/>
 	                <field name="year" invisible="1"/>
 	                <field name="day" invisible="1"/>
 	                <field name="month" invisible="1"/>
 	                <field name="partner_id" invisible="1"/>
-                    <field name="product_id" invisible="1"/>
+	                <field name="product_id" invisible="1"/>
 	                <field name="shop_id" invisible="1"/>
-	                <field name="journal_id" invisible="1"/>
-	                <field name="statement_journal_id" invisible="1"/>
+	                <!--<field name="journal_id" invisible="1"/>-->
+	                <field name="date_validation" invisible="1"/>
+	                <field name="date_payment" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
 	                <field name="nbr" sum="# of Lines"/>
 	                <field name="product_qty" sum="# of Qty"/>
-	                <field name="price_total" sum="Total Price"/>
+	                <field name="average_price" sum="Average Price"/>
 	                <field name="total_discount" sum="Total Discount"/>
-	                <field name="average_price" avg="Average Price"/>
+	                <field name="price_total" sum="Total Price"/>
 	                <field name="delay_validation"/>
 	                <field name="delay_payment"/>
-	                <field name="state" invisible="1"/>
+	                <!--<field name="state" invisible="1"/>-->
 	            </tree>
 	        </field>
         </record>
@@ -58,9 +57,6 @@
                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
                              help="POS ordered created by today"/>
 	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-dolar"
-                            string="Accepted"
-                            domain="[('state_2','=',('to_verify'))]" groups="base.group_extended"/>
                         <filter icon="terp-dolar"
                             string="Invoiced"
                             domain="[('state','=',('invoiced'))]"/>
@@ -82,16 +78,18 @@
 	                    <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
 	                    <separator orientation="vertical"/>
 	                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+	                    <!--<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>-->
                         <separator orientation="vertical"/>
-                        <filter string="Cash Register" icon="terp-folder-orange" context="{'group_by':'statement_journal_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-	                    <separator orientation="vertical"/>
+                        <!--<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>-->
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
 	                </group>
+	                <newline/>
+	                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <field name="date_validation"/>
+                        <field name="date_payment"/>
+                    </group>
 	            </search>
 	        </field>
         </record>
@@ -102,9 +100,9 @@
 	        <field name="view_type">form</field>
 	        <field name="view_mode">tree,graph</field>
 	        <field name="search_view_id" ref="view_report_pos_order_search"/>
-	        <field name="context">{'search_default_today':1,'search_default_User':1}</field>
+	        <field name="context">{'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
 	    </record>
 
 	    <menuitem action="action_report_pos_order_all" id="menu_report_pos_order_all" parent="menu_point_rep" sequence="1"/>
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index e837bb42bbb..9d4b478df79 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -17,5 +17,37 @@
 "access_report_sales_by_user_pos_month","report.sales.by.user.pos.month","model_report_sales_by_user_pos_month","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_margin_pos_month","report.sales.by.margin.pos.month","model_report_sales_by_margin_pos_month","point_of_sale.group_pos_user",1,0,0,0
-"access_singer_statement","singer.statement","model_singer_statement","point_of_sale.group_pos_user",1,0,0,0
+"access_add_product","pos.add.product ","model_pos_add_product","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_confirm","pos.confirm","model_pos_confirm","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_discount","pos.discount","model_pos_discount","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_get_sale","pos.get.sale","model_pos_get_sale","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_close_statement","pos.open.statement","model_pos_open_statement","point_of_sale.group_pos_user",1,1,1,0
+"access_pos_open_statement","pos.close.statement","model_pos_close_statement","point_of_sale.group_pos_user",1,1,1,0
+"acess_pos_box_entries ","pos.box.entries ","model_pos_box_entries","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_box_out","pos.box.out","model_pos_box_out","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sale_user","pos.sale.user","model_pos_sale_user","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sale_user_today","pos.sales.user.today","model_pos_sales_user_today","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sales_user_today_current_user","pos.sales.user.today.current_user","model_pos_sales_user_today_current_user","point_of_sale.group_pos_user",1,0,0,0
+"access_all_closed_cashbox_of_the_day","all.closed.cashbox.of.the.day","model_all_closed_cashbox_of_the_day","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_receipt","pos.receipt ","model_pos_receipt","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_payment_report_user","pos.payment.report.user","model_pos_payment_report_user","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_payment_report_date ","pos.payment.report.date ","model_pos_payment_report_date","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_make_payment","pos.make.payment","model_pos_make_payment","point_of_sale.group_pos_user",1,1,1,0
+"access_pos_scan_product","pos.scan.product","model_pos_scan_product","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_payment_report","pos.payment.report","model_pos_payment_report","point_of_sale.group_pos_user",1,0,0,0
 "access_report_pos_order","report.pos.order","model_report_pos_order","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_return","pos.return","model_pos_return","point_of_sale.group_pos_user",1,0,0,0
+"access_account_bank_statement","account.bank.statement","account.model_account_bank_statement","point_of_sale.group_pos_user",1,1,1,0
+"access_account_bank_statement_line","account.bank.statement.line","account.model_account_bank_statement_line","point_of_sale.group_pos_user",1,1,1,0
+"access_account_period","account.period","account.model_account_period","point_of_sale.group_pos_user",1,1,1,0
+"access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","point_of_sale.group_pos_user",1,1,1,0
+"access_account_cashbox_line","account.cashbox.line","account.model_account_cashbox_line","point_of_sale.group_pos_user",1,1,1,0
+"access_product_product","product.product","product.model_product_product","point_of_sale.group_pos_user",1,1,1,0
+"access_account_move_line","account.move.line","account.model_account_move_line","point_of_sale.group_pos_user",1,1,1,0
+"access_account_move","account.move","account.model_account_move","point_of_sale.group_pos_user",1,1,1,0
+"access_account_journal","account.journal","account.model_account_journal","point_of_sale.group_pos_user",1,1,1,0
+"access_account_journal_view","account.journal.view","account.model_account_journal_view","point_of_sale.group_pos_user",1,1,1,0
+"access_account_analytic_line","account.analytic.line","analytic.model_account_analytic_line","point_of_sale.group_pos_user",1,1,1,0
+"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","point_of_sale.group_pos_user",1,1,1,0
+"access_account_journal_column","account.journal.column","account.model_account_journal_column","point_of_sale.group_pos_user",1,1,1,0
diff --git a/addons/point_of_sale/singer_statement_demo.xml b/addons/point_of_sale/singer_statement_demo.xml
index 43b25437173..e20696d6f53 100644
--- a/addons/point_of_sale/singer_statement_demo.xml
+++ b/addons/point_of_sale/singer_statement_demo.xml
@@ -1,7 +1,69 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+        <record id="pos_visa_journal" model="account.journal">
+            <field name="name">Visa Journal</field>
+            <field name="code">VIJ</field>
+            <field name="type">cash</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+        </record>
 
+        <record id="pos_cash_journal" model="account.journal">
+            <field name="name">Cash Journal</field>
+            <field name="code">CAJ</field>
+            <field name="type">cash</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+        </record>
+
+        <record id="pos_bankcard_journal" model="account.journal">
+            <field name="name">Bancontact Journal</field>
+            <field name="code">BACJ</field>
+            <field name="type">cash</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+        </record>
+
+        <record id="account.sales_journal" model="account.journal">
+            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+        </record>
+
+        <record id="account.refund_sales_journal" model="account.journal">
+            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+        </record>
+
+        <record id="account.expenses_journal" model="account.journal">
+            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+        </record>
+
+        <record id="account.refund_expenses_journal" model="account.journal">
+            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+        </record>
+
+        <record id="account.bank_journal" model="account.journal">
+            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+        </record>
+
+        <record id="account.check_journal" model="account.journal">
+            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+        </record>
+
+        <record id="stock.stock_journal" model="account.journal">
+            <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index cb9a7a9ce03..829e8065376 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -1,480 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="view_account_journal_form">
-            <field name="name">Journal</field>
+        <record model="ir.ui.view" id="view_account_journal_pos_user_form">
+            <field name="name">POS Journal</field>
             <field name="model">account.journal</field>
             <field name="type">form</field>
-            <field name="priority">10</field>
             <field name="inherit_id" ref="account.view_account_journal_form"/>
             <field name="arch" type="xml">
-              <field name="invoice_sequence_id" position="after">
-                    <field  name="statement_sequence_id"/>
-                    <field  name="auto_cash"/>
-                    <field  name="check_dtls"/>
-                    <field  name="special_journal"/>
-              </field>
-            </field>
-          </record>
-
-<!-- Bank Statement -->
-
-       <record id="view_bank_statement_tree" model="ir.ui.view">
-            <field name="name">account.bank.statement.tree</field>
-            <field name="model">account.bank.statement</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state in ('open');blue:state in ('draft')" string="Statement">
-                    <field name="date"/>
-                    <field name="name"/>
-                    <field name="journal_id"/>
-                    <field name="period_id"/>
-                    <field name="balance_start"/>
-                    <field name="balance_end_real"/>
-                    <field name="balance_end"/>
-                    <field name="user_id"/>
-                    <field name="state"/>
-                    <button type="object" string="Open" name="button_open"  states="draft" icon="terp-camera_test"/>
-                    <button type="object" string="Confirm" name="button_confirm" states="open" icon="terp-gtk-go-back-rtl"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_bank_statement_form2" model="ir.ui.view">
-            <field name="name">account.bank.statement.form</field>
-            <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Statement">
-                    <field name="name" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
-                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash'),('auto_cash','=',False)]" select="1" />
-                    <newline/>
-                    <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                    <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
-                    <field name="balance_start"/>
-                    <field name="balance_end_real"/>
-                    <notebook colspan="4">
-                    <page string="Starting Details">
-                        <field name="starting_details_ids" nolabel = "1" colspan="4">
-                            <tree string = "Starting Details" editable="bottom">
-                                <field name="pieces"/>
-                                <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                <field name="subtotal" sum="Total"/>
-                            </tree>
-                            <form string = "Ending Details">
-                                <field name="pieces"/>
-                                <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                <field name="subtotal"/>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Ending Details">
-                        <field name="ending_details_ids" nolabel = "1" colspan="4">
-                            <tree string = "Ending Details" editable="bottom">
-                                <field name="pieces"/>
-                                <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                <field name="subtotal" sum="Total"/>
-                            </tree>
-                            <form string = "Ending Details">
-                                <field name="pieces"/>
-                                <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                <field name="subtotal"/>
-                            </form>
-                        </field>
-                    </page>
-                        <page string="Entry encoding">
-                            <field colspan="4" name="line_ids" nolabel="1">
-                                <tree editable="bottom" string="Statement lines">
-                                    <field name="name"/>
-                                    <field name="ref"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
-                                    <field name="amount"/>
-                                </tree>
-                                <form string="Statement lines">
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
-                                    <field name="amount"/>
-                                    <field name="name"/>
-                                    <field name="ref"/>
-                                    <separator colspan="4" string="Notes"/>
-                                    <field colspan="4" name="note" nolabel="1"/>
-                                </form>
-                            </field>
-                        </page>
-                    </notebook>
-                    <group col="7" colspan="4">
-                        <field name="state" colspan="4"/>
-                        <field name="total_entry_encoding"/>
+                <xpath expr="//notebook[last()]" position="inside">
+                    <page string="Point of Sale">
+                        <group col="6" colspan="4">
+                            <separator colspan="6" string="Extended Configureation"/>
+                            <field name="check_dtls"/>
+                            <field name="auto_cash"/>
+                            <field name="special_journal"/>
                         </group>
-                        <group colspan="4">
-                        <button name="button_dummy" states="draft" icon="gtk-execute" string="Compute"/>
-                        <button name="button_confirm" states="open" icon="terp-gtk-go-back-rtl" string="Close CashBox" type="object"/>
-                        <button name="button_open" states="draft"  icon="terp-camera_test" string="Open CashBox" type="object"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object"  icon="gtk-cancel" groups="base.group_extended"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_bank_statement_form1" model="ir.ui.view">
-            <field name="name">account.bank.statement.form</field>
-            <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Statement">
-                    <field name="name" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
-                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" readonly="1"/>
-                    <newline/>
-                    <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                    <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
-                    <field name="balance_start"/>
-                    <field name="balance_end_real"/>
-                    <notebook colspan="4">
-                    <page string="Details">
-                        <field name="ending_details_ids" nolabel = "1" colspan="4">
-                            <tree string = "Ending Details" editable="bottom">
-                                <field name="pieces"/>
-                                <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                <field name="subtotal" sum="Total"/>
-                            </tree>
-                            <form string = "Ending Details">
-                                <field name="pieces"/>
-                                <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                <field name="subtotal"/>
-                            </form>
-                        </field>
+                        <separator colspan="4" string="Users"/>
+                        <field name="journal_users" nolabel="1" colspan="4"/>
                     </page>
-                        <page string="Entry encoding">
-                            <field colspan="4" name="line_ids" nolabel="1">
-                                <tree editable="bottom" string="Statement lines">
-                                    <field name="name"/>
-                                    <field name="ref"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
-                                    <field name="amount"/>
-                                </tree>
-                                <form string="Statement lines">
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
-                                    <field name="amount"/>
-                                    <field name="name"/>
-                                    <field name="ref"/>
-                                    <separator colspan="4" string="Notes"/>
-                                    <field colspan="4" name="note" nolabel="1"/>
-                                </form>
-                            </field>
-                        </page>
-                    </notebook>
-                    <group col="7" colspan="4">
-                        <field name="state" colspan="4"/>
-                        <field name="total_entry_encoding"/>
-                        </group>
-                        <group colspan="4">
-                        <button name="button_dummy" states="draft" icon="gtk-execute" string="Compute"/>
-                        <button name="button_confirm" states="open" icon="terp-gtk-go-back-rtl" string="Close CashBox" type="object"/>
-                        <button name="button_open" states="draft" icon="terp-camera_test" string="Open CashBox" type="object"/>
-                        <button name="button_cancel" states="confirm"  icon="gtk-cancel" string="Cancel" type="object" groups="base.group_extended"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-        <record id="action_bank_statement_tree_all" model="ir.actions.act_window">
-            <field name="name">My CashBoxes</field>
-            <field name="res_model">account.bank.statement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_bank_statement_tree"/>
-            <field name="domain">[('user_id','=',uid)]</field>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_statement1_all">
-                    <field name="sequence" eval="1"/>
-                    <field name="view_mode">tree</field>
-                    <field name="view_id" ref="view_bank_statement_tree"/>
-                    <field name="act_window_id" ref="action_bank_statement_tree_all"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_statement2_all">
-                    <field name="sequence" eval="1"/>
-                    <field name="view_mode">form</field>
-                    <field name="view_id" ref="view_bank_statement_form1"/>
-                    <field name="act_window_id" ref="action_bank_statement_tree_all"/>
-        </record>
-
-       <!-- <menuitem action="action_bank_statement_tree_all" id="menu_statement_tree_all" parent="point_of_sale.menu_point_root" sequence="2"/-->
-<!--        <menuitem action="action_bank_statement_tree_all" id="menu_statement_tree_all" parent="point_of_sale.menu_point_root" sequence="2"/>
--->
-        <menuitem name="Cashboxes" parent="point_of_sale.menu_point_root" id="menu_statement_tree_all" sequence="3"/>
-
-        <record id="action_bank_statement_tree1" model="ir.actions.act_window">
-            <field name="name">My Cashboxes to Close</field>
-            <field name="res_model">account.bank.statement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_bank_statement_tree"/>
-            <field name="domain">[('state','=','open'), ('user_id','=',uid)]</field>
-
-
-        </record>
-        <record model="ir.actions.act_window.view" id="act_statement1">
-                    <field name="sequence" eval="1"/>
-                    <field name="view_mode">tree</field>
-                    <field name="view_id" ref="view_bank_statement_tree"/>
-                    <field name="act_window_id" ref="action_bank_statement_tree1"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_statement2">
-                    <field name="sequence" eval="1"/>
-                    <field name="view_mode">form</field>
-                    <field name="view_id" ref="view_bank_statement_form1"/>
-                    <field name="act_window_id" ref="action_bank_statement_tree1"/>
-        </record>
-
-<!--        <menuitem action="action_bank_statement_tree1" id="menu_statement_tree1" parent="menu_statement_tree_all" sequence="2"/>-->
-
-        <record id="view_bank_statement_form3" model="ir.ui.view">
-            <field name="name">account.bank.statement.form</field>
-            <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Statement">
-                    <field name="name" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
-                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" readonly="1"/>
-                    <newline/>
-                    <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                    <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
-                    <field name="balance_start"/>
-                    <field name="balance_end_real"/>
-                    <notebook colspan="4">
-                        <page string="Entry encoding">
-                            <field colspan="4" name="line_ids" nolabel="1">
-                                <tree editable="bottom" string="Statement lines">
-                                    <field name="name"/>
-                                    <field name="ref"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
-                                    <field name="amount" />
-                                </tree>
-                                <form string="Statement lines">
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
-                                    <field name="amount"/>
-                                    <field name="name"/>
-                                    <field name="ref"/>
-                                    <separator colspan="4" string="Notes"/>
-                                    <field colspan="4" name="note" nolabel="1"/>
-                                </form>
-                            </field>
-                        </page>
-                    <page string="Starting Details">
-                        <field name="balance_end" colspan="4" nolabel="1"/>
-                        <newline/>
-                        <field name="starting_details_ids" nolabel = "1" colspan="4">
-                            <tree string = "Starting Details" editable="bottom">
-                                <field name="pieces"/>
-                                <field name="number" on_change="on_change_sub(pieces,number)"/>
-                                <field name="subtotal" sum="Total"/>
-                            </tree>
-                            <form string = "Starting Details">
-                                <field name="pieces"/>
-                                <field name="number" on_change="on_change_sub(pieces,number)"/>
-                                <field name="subtotal"/>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Ending Details">
-                        <field name="ending_details_ids" nolabel = "1" colspan="4">
-                            <tree string = "Ending Details" editable="bottom">
-                                <field name="pieces"/>
-                                <field name="number" on_change="on_change_sub(pieces,number)"/>
-                                <field name="subtotal" sum="Total"/>
-                            </tree>
-                            <form string = "Ending Details">
-                                <field name="pieces"/>
-                                <field name="number" on_change="on_change_sub(pieces,number)"/>
-                                <field name="subtotal"/>
-                            </form>
-                        </field>
-                    </page>
-                    </notebook>
-                    <group col="7" colspan="4">
-                        <field name="state" colspan="4"/>
-                        <field name="total_entry_encoding"/>
-                      </group>
-                      <group colspan="4">
-                        <button name="button_dummy" states="draft" icon="gtk-execute" string="Compute"/>
-                        <button name="button_confirm" states="open" icon="terp-gtk-go-back-rtl" string="Close CashBox" type="object"/>
-                        <button name="button_open" states="draft" icon="terp-camera_test" string="Open CashBox" type="object"/>
-                        <button name="button_cancel" states="confirm"  icon="gtk-cancel" string="Cancel" type="object" groups="base.group_extended"/>
-                        
-                    </group>
-                </form>
+                </xpath>
             </field>
         </record>
 
-       <record id="view_bank_statement_tree2" model="ir.ui.view">
-            <field name="name">account.bank.statement.tree</field>
-            <field name="model">account.bank.statement</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="Statement">
-                    <field name="date"/>
-                    <field name="name"/>
-                    <field name="journal_id"/>
-                    <field name="period_id"/>
-                    <field name="balance_start"/>
-                    <field name="balance_end_real"/>
-                    <field name="balance_end"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-        <record id="action_bank_statement_treenew" model="ir.actions.act_window">
-            <field name="name">Open a CashBox</field>
-            <field name="res_model">account.bank.statement</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_bank_statement_form2"/>
-            <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
-
-        </record>
-        <record model="ir.actions.act_window.view" id="act_statement12">
-                    <field name="sequence" eval="2"/>
-                    <field name="view_mode">tree</field>
-                    <field name="view_id" ref="view_bank_statement_tree2"/>
-                    <field name="act_window_id" ref="action_bank_statement_treenew"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_statement22">
-                    <field name="sequence" eval="1"/>
-                    <field name="view_mode">form</field>
-                    <field name="view_id" ref="view_bank_statement_form2"/>
-                    <field name="act_window_id" ref="action_bank_statement_treenew"/>
-        </record>
-       <!-- <menuitem action="action_bank_statement_treenew" id="menu_statement_tree2" parent="menu_statement_tree_all" sequence="1"/>-->
-
-
-        <menuitem action="action_bank_statement_treenew" id="menu_statement_tree2" parent="menu_statement_tree_all" sequence="1"/>
-
-        <record id="view_account_bank_statment_filter" model="ir.ui.view">
-            <field name="name">account.bank.statment.select</field>
-            <field name="model">account.bank.statement</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Cashbox">
-                   <group col='9' colspan='4'>
-                       <filter icon="terp-camera_test" string="Open"
-                           domain="[('state','=','open')]"
-                           help="All open cashboxes"/>
-                       <filter icon="terp-dialog-close" string="To Close"
-                           domain="[('state','=','draft')]"
-                           help="All cashboxes to close"/>
-                       <filter icon="terp-go-today" name="Today" string="Today"
-                          domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
-                           help="All cashboxes to opened today"/>
-                       <separator orientation="vertical"/>
-                       <field name="name"/>
-                   </group>
-                   <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20">
-                       <filter string="Journal" icon="terp-folder-blue" domain="[]" context="{'group_by':'journal_id'}"/>
-                       <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                   </group>
-               </search>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_pos_account_bank_statment">
-            <field name="name">All Cashboxes</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.bank.statement</field>
-            <field name="view_type">form</field>
-            <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_Today':1}</field>
-            <field name="search_view_id" ref="view_account_bank_statment_filter"/>
-
-        </record>
-        <record model="ir.actions.act_window.view" id="act_statement_a1">
-                    <field name="sequence" eval="1"/>
-                    <field name="view_mode">tree</field>
-                    <field name="view_id" ref="view_bank_statement_tree"/>
-                    <field name="act_window_id" ref="action_pos_account_bank_statment"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_statement_a2">
-                    <field name="sequence" eval="1"/>
-                    <field name="view_mode">form</field>
-                    <field name="view_id" ref="view_bank_statement_form3"/>
-                    <field name="act_window_id" ref="action_pos_account_bank_statment"/>
-        </record>
-        <menuitem name="All Cashboxes" parent="menu_statement_tree_all"
-                 action="action_pos_account_bank_statment" id="menu_pos_bank_statment_tree" groups="base.group_extended" sequence="4"/>
-
-        <record model="ir.actions.act_window" id="action_my_all_pos_account_bank_statment">
-            <field name="name">All My Cashboxes</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.bank.statement</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('user_id','=',uid)]</field>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_my_all_statement_a1">
-                    <field name="sequence" eval="1"/>
-                    <field name="view_mode">tree</field>
-                    <field name="view_id" ref="view_bank_statement_tree"/>
-                    <field name="act_window_id" ref="action_my_all_pos_account_bank_statment"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="act_my_all_statement_a2">
-                    <field name="sequence" eval="1"/>
-                    <field name="view_mode">form</field>
-                    <field name="view_id" ref="view_bank_statement_form1"/>
-                    <field name="act_window_id" ref="action_my_all_pos_account_bank_statment"/>
-        </record>
-<!--         <menuitem name="All My Cashboxes" parent="menu_statement_tree_all"-->
-<!--                 action="action_my_all_pos_account_bank_statment" id="menu_my_pos_bank_statment_tree" sequence="3"/>-->
-
-        <record model="ir.actions.act_window" id="action_cashboxes_to_close">
-            <field name="name">Cashboxes to Close</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.bank.statement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','draft')]</field>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_statement_a5">
-                    <field name="sequence" eval="1"/>
-                    <field name="view_mode">tree</field>
-                    <field name="view_id" ref="view_bank_statement_tree"/>
-                    <field name="act_window_id" ref="action_cashboxes_to_close"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_statement_a6">
-                    <field name="sequence" eval="1"/>
-                    <field name="view_mode">form</field>
-                    <field name="view_id" ref="view_bank_statement_form1"/>
-                    <field name="act_window_id" ref="action_cashboxes_to_close"/>
-        </record>
-
-<!--        <menuitem name="Cashboxes to Close" parent="menu_statement_tree_all"-->
-<!--                 action="action_cashboxes_to_close" id="menu_cashboxes_to_close_tree" groups="base.group_extended"/>-->
-
+        <menuitem name="Cash Register" parent="point_of_sale.menu_point_root" id="menu_cash_register" sequence="4"/>
 
         <menuitem
-            name="Open Registers" parent="point_of_sale.menu_point_config"
-            string="Open Register"
+            name="All Cash Registers"
+            parent="menu_cash_register"
+            action="account.action_view_bank_statement_tree"
+            id="menu_all_menu_cash_register"
+            sequence="4"
+        />
+
+        <record id="action_new_bank_statement_tree" model="ir.actions.act_window">
+            <field name="name">Cash Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="account.view_bank_statement_form2"/>
+            <field name="search_view_id" ref="account.view_account_bank_statement_filter"/>
+            <field name="domain">[('journal_id.type', '=', 'cash')]</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="act_cash_statement1_all">
+            <field name="sequence" eval="5"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="account.view_bank_statement_tree"/>
+            <field name="act_window_id" ref="action_new_bank_statement_tree"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="act_cash_statement2_all">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account.view_bank_statement_form2"/>
+            <field name="act_window_id" ref="action_new_bank_statement_tree"/>
+        </record>
+
+        <record id="action_new_bank_statement_all_tree" model="ir.actions.act_window">
+            <field name="name">All Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="account.view_bank_statement_form2"/>
+            <field name="search_view_id" ref="account.view_account_bank_statement_filter"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="act_cash_statement_all_register1">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="account.view_bank_statement_tree"/>
+            <field name="act_window_id" ref="action_new_bank_statement_all_tree"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="act_cash_statement_all_register">
+            <field name="sequence" eval="5"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account.view_bank_statement_form2"/>
+            <field name="act_window_id" ref="action_new_bank_statement_all_tree"/>
+        </record>
+
+        <menuitem
+            name="All Registers"
+            parent="menu_cash_register"
+            action="action_new_bank_statement_all_tree"
+            id="menu_all_menu_all_register"
+            sequence="4"
+        />
+
+        <menuitem
+            name="Open a Cash Registers"
+            parent="menu_cash_register"
+            action="action_new_bank_statement_tree"
+            id="menu_new_cash_register"
+            sequence="3"
+        />
+
+        <menuitem name="Register management" parent="point_of_sale.menu_point_root"
+            id="menu_point_open_config" sequence="1"/>
+        <menuitem
+            name="Open my Cash Registers" parent="menu_point_open_config"
+            string="Open my Cash Register"
             action="action_pos_open_statement"
             id="menu_open_statement" sequence="1" />
 
-       <menuitem icon="STOCK_PRINT"
-                    action="action_report_all_closed_cashbox_of_the_day"
-                 id="menu_all_closed_cashbox_of_the_day"
-                 parent="menu_statement_tree_all"/>
-
         <menuitem
-            name="Close Register" parent="point_of_sale.menu_point_config"
-            string="Close Register"
+            name="Close my Cash Register" parent="menu_point_open_config"
+            string="Close my Cash Register"
             action="action_pos_close_statement"
             id="menu_close_statement" sequence="2" />
 
-       <menuitem icon="STOCK_PRINT"
-                    action="action_report_all_closed_cashbox_of_the_day"
-                 id="menu_all_closed_cashbox_of_the_day"
-                 parent="menu_point_report_register"/>
-
     </data>
 </openerp>
diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index fe57e6642f2..fce971fe2af 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -35,14 +35,16 @@ def get_journal(self, cr, uid, context):
     """
 
     obj = self.pool.get('account.journal')
+    statement_obj = self.pool.get('account.bank.statement')
     user = self.pool.get('res.users').browse(cr, uid, uid)
     ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', user.company_id.id)])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    res.insert(0, ('', ''))
+    obj_ids= statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', ids)])
+    res_obj = obj.read(cr, uid, ids, ['journal_id'], context)
+    res_obj = [(r1['id'])for r1 in res_obj]
+    res = statement_obj.read(cr, uid, obj_ids, ['journal_id'], context)
+    res = [(r['journal_id']) for r in res]
     return res
 
-
 class pos_box_entries(osv.osv_memory):
     _name = 'pos.box.entries'
     _description = 'Pos Box Entries'
@@ -62,15 +64,15 @@ class pos_box_entries(osv.osv_memory):
         obj = self.pool.get('product.product')
         ids = obj.search(cr, uid, [('income_pdt', '=', True)])
         res = obj.read(cr, uid, ids, ['id', 'name'], context)
-        res = [(r['id'], r['name']) for r in res]
+        res = [(r['id'],r['name']) for r in res]
         res.insert(0, ('', ''))
 
         return res
 
 
     _columns = {
-                'name': fields.char('Name', size=32, required=True),
-                'journal_id': fields.selection(get_journal, "Journal", required=True),
+                'name': fields.char('Description', size=32, required=True),
+                'journal_id': fields.selection(get_journal, "Register", required=True),
                 'product_id': fields.selection(_get_income_product, "Operation", required=True),
                 'amount': fields.float('Amount', digits=(16, 2)),
                 'ref': fields.char('Ref', size=32),
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index e0f0a21402f..75dea51e4a2 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>        
+    <data>
         <!--  Box Entries -->
-        
+
 		<record id="view_box_entries" model="ir.ui.view">
             <field name="name">Box Entries</field>
             <field name="model">pos.box.entries</field>
@@ -14,11 +14,11 @@
 				    	<field name="journal_id"/>
 				    	<field name="product_id"/>
 				    	<field name="amount"/>
-				    	<field name="ref"/>
+<!--				    	<field name="ref"/>-->
 				    	<group colspan="4" col="2">
 				 		<button icon='gtk-cancel' special="cancel"
                 			string="Close" />
-                		<button name="get_in" string="Make Entries in the CashBox"
+                		<button name="get_in" string="Take Money"
                 			colspan="1" type="object" icon="gtk-ok" />
                 			</group>
                 </form>
@@ -31,8 +31,8 @@
             <field name="res_model">pos.box.entries</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-            <field name="target">new</field>            
+            <field name="target">new</field>
         </record>
-        
+
 	</data>
-</openerp>	        
+</openerp>
diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
index ea5768e5099..c4871a2f03a 100644
--- a/addons/point_of_sale/wizard/pos_box_out.py
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -49,8 +49,8 @@ class pos_box_out(osv.osv_memory):
         return res
 
     _columns = {
-                'name': fields.char('Name', size=32, required=True),
-                'journal_id': fields.selection(pos_box_entries.get_journal, "Journal", required=True),
+                'name': fields.char('Description', size=32, required=True),
+                'journal_id': fields.selection(pos_box_entries.get_journal, "Register", required=True),
                 'product_id': fields.selection(_get_expense_product, "Operation", required=True),
                 'amount': fields.float('Amount', digits=(16, 2)),
                 'ref': fields.char('Ref', size=32),
@@ -62,12 +62,12 @@ class pos_box_out(osv.osv_memory):
     def get_out(self, cr, uid, ids, context):
 
         """
-             Create the entries in the CashBox   .
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary
-             @return :Return of operation of product
+         Create the entries in the CashBox   .
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return :Return of operation of product
         """
         args = {}
         statement_obj = self.pool.get('account.bank.statement')
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index c634b4cf997..9922f211c6e 100644
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>        
+    <data>
         <!--  Box Entries -->
-        
+
 		<record id="view_pos_box_out" model="ir.ui.view">
             <field name="name">Box Out</field>
             <field name="model">pos.box.out</field>
@@ -14,11 +14,11 @@
 				    	<field name="journal_id"/>
 				    	<field name="product_id"/>
 				    	<field name="amount"/>
-				    	<field name="ref"/>
+<!--				    	<field name="ref"/>-->
 				    	<group colspan="4" col="2">
 				 		<button icon='gtk-cancel' special="cancel"
                 			string="Close" />
-                		<button name="get_out" string="Make Entries in the CashBox"
+                		<button name="get_out" string="Put Money"
                 			colspan="1" type="object" icon="gtk-ok" />
                 			</group>
                 </form>
@@ -31,8 +31,8 @@
             <field name="res_model">pos.box.out</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-            <field name="target">new</field>            
+            <field name="target">new</field>
         </record>
-        
+
 	</data>
-</openerp>	        
+</openerp>
diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
index ca07180974b..22c3e77ad63 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.py
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -22,7 +22,6 @@
 from osv import osv
 from tools.translate import _
 
-
 class pos_close_statement(osv.osv_memory):
     _name = 'pos.close.statement'
     _description = 'Close Statements'
@@ -38,27 +37,55 @@ class pos_close_statement(osv.osv_memory):
         """
         company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
         list_statement = []
+        mod_obj = self.pool.get('ir.model.data')
         statement_obj = self.pool.get('account.bank.statement')
         journal_obj = self.pool.get('account.journal')
-        journal_lst = journal_obj.search(cr, uid, [('company_id', '=', company_id), ('auto_cash', '=', True), ('check_dtls', '=', False)])
-        journal_ids = journal_obj.browse(cr, uid, journal_lst)
+        user_obj="""select DISTINCT journal_id from pos_journal_users where user_id=%d"""%(uid)
+        cr.execute(user_obj)
+        user_journals1= cr.fetchall()
+        lst1=map(lambda x1:x1[0],user_journals1)
+        journal_ids = journal_obj.browse(cr, uid, lst1)
+
         for journal in journal_ids:
             ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)])
-            list_statement = ids
-            statement_obj.button_confirm(cr, uid, ids, context)
-        if not list_statement:
-            return {}
+            sql = """ select id from account_journal
+                            where auto_cash = 'True'
+                            and company_id =%d and id =%d"""%(company_id,journal.id)
+            cr.execute(sql)
+            user_journals= cr.fetchall()
+            lst=map(lambda x1:x1[0],user_journals)
+            journal_ids1 = journal_obj.browse(cr, uid, lst)
+            #list_statement=[]
+
+            for journal1 in journal_ids1:
+                ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)])
+                if not ids:
+                    raise osv.except_osv(_('Message'), _('Journals are allready closed'))
+                else:
+                    list_statement.append(ids[0])
+                    if not journal.check_dtls:
+                        statement_obj.button_confirm_bank(cr, uid, ids, context)
+    #        if not list_statement:
+    #            return {}
+    #        model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_bank_statement_tree')], context=context)
+    #        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'account', 'view_bank_statement_tree')
+        id3 = data_obj._get_id(cr, uid, 'account', 'view_bank_statement_form2')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
         return {
-                'domain': "[('id','in', list_statement)]",
+                'domain': "[('id','in'," + str(list_statement) + ")]",
                 'name': 'Close Statements',
                 'view_type': 'form',
                 'view_mode': 'tree,form',
                 'res_model': 'account.bank.statement',
-                'view_id': False,
-                'type': 'ir.actions.act_window'
-}   
+                'views': [(id2, 'tree'),(id3, 'form')],
+                'type': 'ir.actions.act_window'}
 
 pos_close_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 7fb33ba7f09..8db05d32f53 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -23,7 +23,6 @@ from osv import osv
 from tools.translate import _
 import time
 
-
 class pos_open_statement(osv.osv_memory):
     _name = 'pos.open.statement'
     _description = 'Open Statements'
@@ -38,67 +37,91 @@ class pos_open_statement(osv.osv_memory):
              @return : Blank Directory
         """
         list_statement = []
+        mod_obj = self.pool.get('ir.model.data')
         company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
         statement_obj = self.pool.get('account.bank.statement')
         singer_obj = self.pool.get('singer.statement')
         sequence_obj = self.pool.get('ir.sequence')
         journal_obj = self.pool.get('account.journal')
-        journal_lst = journal_obj.search(cr, uid, [('company_id', '=', company_id), ('auto_cash', '=', True)])
-        journal_ids = journal_obj.browse(cr, uid, journal_lst)
+        user_obj="""select DISTINCT journal_id from pos_journal_users where user_id=%d"""%(uid)
+        cr.execute(user_obj)
+        user_journals1= cr.fetchall()
+        lst1=map(lambda x1:x1[0],user_journals1)
+        journal_ids = journal_obj.browse(cr, uid, lst1)
+
         for journal in journal_ids:
             ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)])
-            if len(ids):
-                raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s". \n Please close the cashbox related to. ' % (journal.name)))
-            sql = """ Select id from account_bank_statement
-                                    where journal_id=%d
-                                    and company_id =%d
-                                    order by id desc limit 1""" % (journal.id, company_id)
+            sql = """ select id from account_journal
+                            where auto_cash = 'True'
+                            and company_id =%d and id =%d"""%(company_id,journal.id)
             cr.execute(sql)
-            st_id = cr.fetchone()
-            number = ''
-            if journal.statement_sequence_id:
-                number = sequence_obj.get_id(cr, uid, journal.id)
-            else:
-                number = sequence_obj.get(cr, uid,
-                                'account.bank.statement')
+            user_journals= cr.fetchall()
+            lst=map(lambda x1:x1[0],user_journals)
+            journal_ids1 = journal_obj.browse(cr, uid, lst)
 
-    #        statement_id=statement_obj.create(cr,uid,{'journal_id':journal.id,
-    #                                                  'company_id':company_id,
-    #                                                  'user_id':uid,
-    #                                                  'state':'open',
-    #                                                  'name':number
-    #                                                  })
-            period = statement_obj._get_period(cr, uid, context) or None
-            cr.execute("INSERT INTO account_bank_statement(journal_id,company_id,user_id,state,name, period_id,date) VALUES(%d,%d,%d,'open','%s',%d,'%s')"%(journal.id, company_id, uid, number, period, time.strftime('%Y-%m-%d %H:%M:%S')))
-            cr.execute("select id from account_bank_statement where journal_id=%d and company_id=%d and user_id=%d and state='open' and name='%s'"%(journal.id, company_id, uid, number))
-            statement_id = cr.fetchone()[0]
-            if st_id:
-                statemt_id = statement_obj.browse(cr, uid, st_id[0])
-                list_statement.append(statemt_id.id)
-                if statemt_id and statemt_id.ending_details_ids:
-                    statement_obj.write(cr, uid, [statement_id], {
-                        'balance_start': statemt_id.balance_end,
-                        'state': 'open',
-                    })
-                    if statemt_id.ending_details_ids:
-                        for i in statemt_id.ending_details_ids:
-                            c = singer_obj.create(cr, uid, {
-                                'pieces': i.pieces,
-                                'number': i.number,
-                                'starting_id': statement_id,
-                            })
-            return {
-                'domain': "[('id','in', ["+','.join(map(str,list_statement))+"])]",
-                'name': 'Open Statement',
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'account.bank.statement',
-                'view_id': False, # TODO: REFERENCE RIGHT VIEWS
-                'type': 'ir.actions.act_window'
-}   
-        return {}
+            for journal1 in journal_ids1:
+                ids1 = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)])
+                if len(ids):
+                    raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s". \n Please close the cashbox related to. ' %(journal.name)))
+                sql = """ Select id from account_bank_statement
+                                        where journal_id =%d
+                                        and company_id =%d
+                                        order by id desc limit 1""" %(journal.id, company_id)
+                cr.execute(sql)
+                st_id = cr.fetchone()
+                number = ''
+                if journal.sequence_id:
+                    number = sequence_obj.get_id(cr, uid, journal.id)
+                else:
+                    number = sequence_obj.get(cr, uid,
+                                    'account.bank.statement')
+                statement_id=statement_obj.create(cr,uid,{'journal_id':journal.id,
+                                                          'company_id':company_id,
+                                                          'user_id':uid,
+                                                          'state':'open',
+                                                          'name':number
+                                                          })
+                statement_obj.button_open(cr,uid,[statement_id],context)
 
+    #            period = statement_obj._get_period(cr, uid, context) or None
+    #            cr.execute("INSERT INTO account_bank_statement(journal_id,company_id,user_id,state,name, period_id,date) VALUES(%d,%d,%d,'open','%s',%d,'%s')"%(journal.id, company_id, uid, number, period, time.strftime('%Y-%m-%d %H:%M:%S')))
+    #            cr.commit()
+    #            cr.execute("select id from account_bank_statement where journal_id=%d and company_id=%d and user_id=%d and state='open' and name='%s'"%(journal.id, company_id, uid, number))
+    #            statement_id = cr.fetchone()[0]
+    #            print "statement_id",statement_id
+    #            if st_id:
+    #                statemt_id = statement_obj.browse(cr, uid, st_id[0])
+    #                list_statement.append(statemt_id.id)
+    #                if statemt_id and statemt_id.ending_details_ids:
+    #                    statement_obj.write(cr, uid, [statement_id], {
+    #                        'balance_start': statemt_id.balance_end,
+    #                        'state': 'open',
+    #                    })
+    #                    if statemt_id.ending_details_ids:
+    #                        for i in statemt_id.ending_details_ids:
+    #                            c = statement_obj.create(cr, uid, {
+    #                                'pieces': i.pieces,
+    #                                'number': i.number,
+    #                                'starting_id': statement_id,
+    #                            })
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'account', 'view_bank_statement_tree')
+        id3 = data_obj._get_id(cr, uid, 'account', 'view_bank_statement_form2')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        return {
+#           'domain': "[('id','in', ["+','.join(map(str,list_statement))+"])]",
+            'domain': "[('state','=','open')]",
+            'name': 'Open Statement',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.bank.statement',
+            'views': [(id2, 'tree'),(id3, 'form')],
+            'type': 'ir.actions.act_window'
+}
 pos_open_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index cd8a85ea8c2..403e92b11b8 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,31 +31,31 @@ import pos_receipt
 class pos_make_payment(osv.osv_memory):
     _name = 'pos.make.payment'
     _description = 'Point of Sale Payment'
-    
+
     def default_get(self, cr, uid, fields, context):
-        """ 
+        """
          To get default values for the object.
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
-         @param fields: List of fields for which we want default values 
-         @param context: A standard dictionary 
-         @return: A dictionary which of fields with values. 
+         @param fields: List of fields for which we want default values
+         @param context: A standard dictionary
+         @return: A dictionary which of fields with values.
         """
         res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
-        
-        active_id = context and context.get('active_id',False) 
-        if active_id: 
+
+        active_id = context and context.get('active_id',False)
+        if active_id:
             j_obj = self.pool.get('account.journal')
             company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
             journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
-            
+
             if journal:
                 journal = journal[0]
             else:
                 journal = None
             wf_service = netsvc.LocalService("workflow")
-    
+
             order_obj=self.pool.get('pos.order')
             order = order_obj.browse(cr, uid, active_id, context)
             #get amount to pay
@@ -66,50 +66,50 @@ class pos_make_payment(osv.osv_memory):
             elif order.amount_paid > 0.0:
                 order_obj.write(cr, uid, [active_id], {'state': 'advance'})
             invoice_wanted_checked = False
-        
+
             current_date = time.strftime('%Y-%m-%d')
-                
+
             if 'journal' in fields:
-                res.update({'journal':journal})         
+                res.update({'journal':journal})
             if 'amount' in fields:
-                res.update({'amount':amount})   
+                res.update({'amount':amount})
             if 'invoice_wanted' in fields:
-                res.update({'invoice_wanted':invoice_wanted_checked})               
+                res.update({'invoice_wanted':invoice_wanted_checked})
             if 'payment_date' in fields:
                 res.update({'payment_date':current_date})
-            if 'payment_name'  in fields: 
-                res.update({'payment_name':'Payment'})    
+            if 'payment_name'  in fields:
+                res.update({'payment_name':'Payment'})
         return res
-        
+
     def view_init(self, cr, uid, fields_list, context=None):
         res = super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
-        active_id = context and context.get('active_id', False) or False        
+        active_id = context and context.get('active_id', False) or False
         if active_id:
             order = self.pool.get('pos.order').browse(cr, uid, active_id)
             if not order.lines:
                 raise osv.except_osv('Error!','No order lines defined for this sale ')
         return True
-    
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        """ 
+        """
              Changes the view dynamically
-        
+
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
-             @param context: A standard dictionary 
-             
+             @param context: A standard dictionary
+
              @return: New arch of view.
-        
+
         """
-     
-                
+
+
         result = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         active_model = context.get('active_model')
         active_id = context.get('active_id', False)
         if not active_id or (active_model and active_model != 'pos.order'):
-            return result                  
-                 
+            return result
+
         order = self.pool.get('pos.order').browse(cr, uid, active_id)
         if order.amount_total == order.amount_paid:
             result['arch'] = """ <form string="Make Payment" colspan="4">
@@ -120,22 +120,23 @@ class pos_make_payment(osv.osv_memory):
                                 <button name="print_report" string="Print Receipt" type="object" icon="gtk-print"/>
                             </group>
                         </form>
-                    """                                   
+                    """
         return result
 
     def check(self, cr, uid, ids, context):
-        
+
         """Check the order:
         if the order is not paid: continue payment,
         if the order is paid print invoice (if wanted) or ticket.
         """
-        active_id = context and context.get('active_id',False)      
+        active_id = context and context.get('active_id',False)
         order_obj = self.pool.get('pos.order')
-        jrnl_obj = self.pool.get('account.journal')        
+        jrnl_obj = self.pool.get('account.journal')
         order = order_obj.browse(cr, uid, active_id, context)
+        order_name = order.name
         amount = order.amount_total - order.amount_paid
         data =  self.read(cr, uid, ids)[0]
-        
+
         # Todo need to check ...
         if amount !=0.0:
             invoice_wanted = data['invoice_wanted']
@@ -143,61 +144,140 @@ class pos_make_payment(osv.osv_memory):
             if data.get('journal',False):
                 jrnl_used=jrnl_obj.browse(cr, uid, data['journal'])
             order_obj.write(cr, uid, [active_id], {'invoice_wanted': invoice_wanted})
-            order_obj.add_payment(cr, uid, active_id, data, context=context)            
+            order_obj.add_payment(cr, uid, active_id, data, context=context)
+
+        res_obj = self.pool.get('res.company')
+        inv_ref = self.pool.get('account.invoice')
+        inv_line_ref = self.pool.get('account.invoice.line')
+        product_obj= self.pool.get('product.product')
+        inv_ids = []
+        for order in self.pool.get('pos.order').browse(cr, uid, ids, context):
+#            curr_c = order.user_salesman_id.company_id
+            make_obj = self.pool.get('pos.make.payment').browse(cr, uid, uid)
+        if invoice_wanted:
+            if order.invoice_id:
+                inv_ids.append(order.invoice_id.id)
+#                continue
+#            if not make_obj.partner_id:
+#                raise osv.except_osv(_('Error'), _('Please provide a partner for the sale.'))
+            acc= make_obj.partner_id.property_account_receivable.id
+            inv = {
+                'name': 'Invoice from POS: '+order_name,
+                'origin': order_name,
+                'account_id':acc,
+                'journal_id':order.sale_journal.id or None,
+                'type': 'out_invoice',
+                'reference': order.name,
+                'partner_id': make_obj.partner_id.id,
+                'comment': order.note or '',
+            }
+            inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', make_obj.partner_id.id)['value'])
+            if not inv.get('account_id', None):
+                inv['account_id'] = acc
+            inv_id = inv_ref.create(cr, uid, inv, context)
+            self.write(cr, uid, [order.id], {'invoice_id': inv_id, 'state': 'invoiced'})
+            inv_ids.append(inv_id)
+            for line in order.lines:
+                inv_line = {
+                    'invoice_id': inv_id,
+                    'product_id': line.product_id.id,
+                    'quantity': line.qty,
+                }
+                inv_name = product_obj.name_get(cr, uid, [line.product_id.id], context=context)[0][1]
+
+                inv_line.update(inv_line_ref.product_id_change(cr, uid, [],
+                                                               line.product_id.id,
+                                                               line.product_id.uom_id.id,
+                                                               line.qty, partner_id = make_obj.partner_id.id, fposition_id=make_obj.partner_id.property_account_position.id)['value'])
+#                inv_line['price_unit'] = line.price_unit
+#                inv_line['discount'] = line.discount
+#                inv_line['account_id'] = acc
+#                inv_line['name'] = inv_name
+                inv_line['price_unit'] = amount
+                inv_line['discount'] = line.discount
+                inv_line['account_id'] = acc
+                inv_line['name'] = inv_name
+                inv_line['invoice_line_tax_id'] = ('invoice_line_tax_id' in inv_line)\
+                    and [(6, 0, inv_line['invoice_line_tax_id'])] or []
+                inv_line_ref.create(cr, uid, inv_line, context)
+        for i in inv_ids:
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'account.invoice', i, 'invoice_open', cr)
+#        return inv_ids
         # Todo need to check
 #        if amount<=0.0:
 #            context.update({'flag':True})
 #            order_obj.action_paid(cr,uid,[active_id],context)
-        if order_obj.test_paid(cr, uid, [active_id]):
-            if order.partner_id and order.invoice_wanted:
-                return self.create_invoice(cr, uid, ids, context)
-            else:
-                context.update({'flag': True})                
-                order_obj.action_paid(cr, uid, [active_id], context)         
+
+#    def test_paid(self, cr, uid, ids, context=None):
+#        """ Test all amount is paid for this order
+#        @return: True
+#        """
+#        for order in self.browse(cr, uid, ids, context):
+#            if order.lines and not order.amount_total:
+#                return True
+#            if (not order.lines) or (not order.statement_ids) or \
+#                Decimal(str(order.amount_total))!=Decimal(str(order.amount_paid)):
+#                return False
+#        return True
+#        if order_obj.test_paid(cr, uid, [active_id]):
+        if order_obj.browse(cr, uid, [active_id]):
+            if make_obj.partner_id and make_obj.invoice_wanted:
+                order_obj.write(cr, uid, [active_id],{'state':'paid'})
                 if context.get('return'):
-                    order_obj.write(cr, uid, [active_id],{'state':'done'})   
+                    order_obj.write(cr, uid, [active_id],{'state':'done'})
                 else:
-                     order_obj.write(cr, uid, [active_id],{'state':'paid'})    
-                return self.print_report(cr, uid, ids, context)  
+                     order_obj.write(cr, uid, [active_id],{'state':'paid'})
+                return self.print_report(cr, uid, ids, context)
+#                return self.create_invoice(cr, uid, ids, context)
+            else:
+                context.update({'flag': True})
+                order_obj.action_paid(cr, uid, [active_id], context)
+                if context.get('return'):
+                    order_obj.write(cr, uid, [active_id],{'state':'done'})
+                else:
+                     order_obj.write(cr, uid, [active_id],{'state':'paid'})
+                return self.print_report(cr, uid, ids, 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)
             self.pool.get('pos.order').write(cr, uid, [active_id],{'state':'advance'})
-            return self.print_report(cr, uid, ids, context)            
-        return {}
+            return self.print_report(cr, uid, ids, context)
+#        return {}
+        return inv_ids
+
 
-    
     def create_invoice(self, cr, uid, ids, context):
-        
+
+        """
+          Create  a invoice
         """
-          Create  a invoice 
-        """        
         wf_service = netsvc.LocalService("workflow")
-        active_ids = [context and context.get('active_id',False)]      
+        active_ids = [context and context.get('active_id',False)]
         for i in active_ids:
             wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
-        datas = {'ids' : context.get('active_id', [])}        
-        return { 
+        datas = {'ids' : context.get('active_id', [])}
+        return {
                 'type' : 'ir.actions.report.xml',
                 'report_name':'pos.invoice',
-                'datas' : datas,               
-        }            
-                    
+                'datas' : datas,
+        }
+
     def print_report(self, cr, uid, ids, context=None):
-        """ 
-         @summary: To get the date and print the report           
+        """
+         @summary: To get the date and print the report
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
-         @param context: A standard dictionary 
+         @param context: A standard dictionary
          @return : retrun report
-        """          
+        """
         if not context:
             context={}
-        active_id=context.get('active_id',[])        
+        active_id=context.get('active_id',[])
         datas = {'ids' : [active_id]}
-        res =  {}        
+        res =  {}
         datas['form'] = res
 
         return {
@@ -207,7 +287,7 @@ class pos_make_payment(osv.osv_memory):
        }
 
     _columns = {
-        'journal':fields.selection(pos_box_entries.get_journal, "Journal",required=True),
+        'journal':fields.selection(pos_box_entries.get_journal, "Cash Register",required=True),
         'product_id': fields.many2one('product.product', "Acompte"),
         'amount':fields.float('Amount', digits=(16,2) ,required= True),
         'payment_name': fields.char('Payment name', size=32, required=True),
@@ -215,8 +295,15 @@ class pos_make_payment(osv.osv_memory):
         'is_acc': fields.boolean('Accompte'),
         'invoice_wanted': fields.boolean('Invoice'),
         'num_sale':fields.char('Num.File', size=32),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
+        'partner_id': fields.many2one('res.partner', 'Customer'),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice'),
+        'state': fields.selection([('draft', 'Draft'), ('payment', 'Payment'),
+                                    ('advance','Advance'),
+                                   ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced'), ('cancel', 'Cancel')],
+                                  'State', readonly=True, ),
     }
-    
+
 pos_make_payment()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 6608f837a63..ad71d177357 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -12,11 +12,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Add payment :">
-				<group colspan="4" >
-				    <field name="amount" />
+				<group colspan="4" width="600" height="230">
 				    <field name="journal"/>
+				    <field name="amount" />
 				    <field name="payment_date" />
-				    <field name="payment_name" />
+				    <!--field name="payment_name" /-->
 				    <field name="invoice_wanted" />
 				    <field name="num_sale" />
 				    <field name="is_acc" />
@@ -24,6 +24,11 @@
 				    	<field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]"/>
 				    </group>
 				    <newline/>
+				    <group attrs="{'invisible':[('invoice_wanted','=',False)]}" colspan="4">
+				    	<field name="partner_id" attrs="{'required':[('invoice_wanted', '=', True)]}"  colspan="2"/>
+				    	<field name="pricelist_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
+				    </group>
+				    <newline/>
 				    <group col="2" colspan="4">
 	            		<button icon='gtk-cancel' special="cancel"  string="Cancel" />
 						<button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-ok"/>
@@ -42,4 +47,4 @@
         </record>
 	</data>
 </openerp>	
-        
\ No newline at end of file
+        
diff --git a/addons/point_of_sale/wizard/pos_receipt.py b/addons/point_of_sale/wizard/pos_receipt.py
index daf63fd6674..33252f20606 100644
--- a/addons/point_of_sale/wizard/pos_receipt.py
+++ b/addons/point_of_sale/wizard/pos_receipt.py
@@ -41,10 +41,10 @@ class pos_receipt(osv.osv_memory):
          @return: New arch of view with new columns.
         """         
         order_lst = self. pool.get('pos.order').browse(cr, uid, context['active_id'])
-        for order in order_lst:
-            if order.state_2 in ('to_verify'):
-                raise osv.except_osv(_('Error!', 'Can not print the receipt because of discount and/or payment '))
-        True
+#        for order in order_lst:
+#            if order.state_2 in ('to_verify'):
+#                raise osv.except_osv(_('Error!', 'Can not print the receipt because of discount and/or payment '))
+#        True
 
     def print_report(self, cr, uid, ids, context=None):
 
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index 57b28e76311..829bd13c1a1 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -33,7 +33,7 @@
      for e.g product/process/product_process_xml
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index 210dbdc7098..1f11ebcd22e 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name" : "Procurements",
     "version" : "1.0",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Production",
     "depends" : ["base","process", "product", "stock"],
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index e7a5f1c195a..4aad723b2f9 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -291,8 +291,7 @@ class procurement_order(osv.osv):
             if not procurement.product_id.seller_ids:
                 cr.execute('update procurement_order set message=%s where id=%s', (_('No supplier defined for this product !'), procurement.id))
                 return False
-            partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  procurement.product_id.seller_ids if partner_id and partner_id.sequence])
-            partner = partner_list and partner_list[0] and partner_list[0][1] and partner_list[0][1].name or False
+            partner = procurement.product_id.seller_id #Taken Main Supplier of Product of Procurement.
 
             if user.company_id and user.company_id.partner_id:
                 if partner.id == user.company_id.partner_id.id:
@@ -319,7 +318,7 @@ class procurement_order(osv.osv):
         move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_qty <= 0.00:
-                raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!'))
+                raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity in Procurement Order(s), it should not be less than 1!'))
             if procurement.product_id.type in ('product', 'consu'):
                 if not procurement.move_id:
                     source = procurement.location_id.id
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index fff13e36330..11c1287152c 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -70,7 +70,7 @@
                     	<group colspan="4"  groups="base.group_extended">
                     		<separator colspan="4" string="Properties" />
                         	<field colspan="4" name="property_ids" nolabel="1"/>
-	                 </group>                        
+	                 </group>
                     </page>
                     <page string="Notes">
                         <separator colspan="4" string="Note" />
@@ -119,6 +119,7 @@
             <field name="context">{'search_default_current':1}</field>
             <field name="search_view_id" ref="view_procurement_filter"/>
             <field name="context">{'search_default_Current':1}</field>
+            <field name="help">The procurement order will schedule a proposal for automatic procurement for the product concerned. This procurement will start a task, a purchase order form for the supplier or a production depending on the product configuration.</field>
         </record>
 
         <record id="procurement_action3" model="ir.actions.act_window">
@@ -139,6 +140,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception')]</field>
+            <field name="help"> For each customer order line or raw materials in a manufacturing order, there is a procurement form . In normal system use, procurement orders are automatically generated by Open ERP. But if there are configuration problems, the system can remain blocked by a procurement without generating a corresponding document. It is a procurement exception. Some problems are link to timing and will be correct automatically by the system. If there is no procurement rule, the exception must be corrected manually.</field>
         </record>
 
         <record id="procurement_action4" model="ir.actions.act_window">
@@ -255,18 +257,18 @@
 
         <act_window
             context="{'product_uom': locals().has_key('uom_id') and uom_id}"
-            domain="[('product_id', '=', active_id)]"
+            domain="[('procurement_id', '=', active_id)]"
             id="act_procurement_2_stock_warehouse_orderpoint"
             name="Minimum Stock Rules"
             res_model="stock.warehouse.orderpoint"
             src_model="procurement.order"/>
 
-        <act_window
-            domain="[('id', '=', product_id)]"
-            id="act_product_product_2_stock_warehouse_orderpoint"
-            name="Product"
-            res_model="product.product"
-            src_model="procurement.order"/>
+<!--        <act_window-->
+<!--            domain="[('id', '=', product_id)]"-->
+<!--            id="act_product_product_2_stock_warehouse_orderpoint"-->
+<!--            name="Product"-->
+<!--            res_model="product.product"-->
+<!--            src_model="procurement.order"/>-->
 
     </data>
 </openerp>
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index b3e18ced10a..15dec4892d1 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,7 +23,7 @@
 {
     "name" : "Products & Pricelists",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Generic Modules/Inventory Control",
     "depends" : ["base", "process", "decimal_precision"],
     "init_xml" : [],
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index 37f515c33f1..be930f1d6d2 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -1,30 +1,31 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* product
-#
+# * product
+# Giedrius Slavinskas <giedrius.slavinskas@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
+"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"
-"PO-Revision-Date: 2009-11-18 06:29+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-07-20 22:36+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-06-22 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: lt\n"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Max. Margin"
-msgstr ""
+msgstr "Maks. Skirtumas"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Base Price"
-msgstr ""
+msgstr "Bazinė kaina"
 
 #. module: product
 #: help:product.template,standard_price:0
@@ -32,25 +33,25 @@ msgid ""
 "The cost of the product for accounting stock valuation. It can serves as a "
 "base price for supplier price."
 msgstr ""
+"Produkto kaina apskaitos būklės įvertinimui. Gali būti naudojama tiekėjo "
+"bazinė kainą."
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Service"
-msgstr ""
+msgstr "Paslauga"
 
 #. module: product
 #: help:product.template,purchase_ok:0
 msgid ""
 "Determine if the product is visible in the list of products within a "
 "selection from a purchase order line."
-msgstr ""
-"Pažymėkite, jeigu norite, kad šis produktas būtų matomas perkamų produktų "
-"sąraše."
+msgstr "Nustatyti ar produktas bus matomas perkamų produktų sąraše."
 
 #. module: product
 #: help:product.supplierinfo,name:0
 msgid "Supplier of this product"
-msgstr "Produkto tiekėjas"
+msgstr "Šio produkto tiekėjas"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -68,13 +69,13 @@ msgid ""
 "The minimal quantity to purchase for this supplier, expressed in the default "
 "unit of measure."
 msgstr ""
-"Minimalus kiekis, kurį galima nusipirkti iš tiekėjo, išreikštas numatytuoju "
-"mato vienetu."
+"Mažiausias kiekis, kurį galima pirkti iš tiekėjo, išreikštas numatytaisiais "
+"šio produkto mato vienetais."
 
 #. module: product
 #: field:product.template,weight_net:0
 msgid "Net weight"
-msgstr ""
+msgstr "Neto svoris"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -82,8 +83,8 @@ msgid ""
 "Quantities of products that are planned to arrive in selected locations or "
 "all internal if none have been selected."
 msgstr ""
-"Planuojami gauti produktų kiekiai į pasirinktas vietas. Jei nebuvo nurodytos "
-"vietos, tai  į visas vidines."
+"Produktų kiekis, planuojamas atsivežti į pasirinktas vietas, arba visas "
+"kiekis, jei nė viena vieta nebuvo pasirinkta."
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -93,13 +94,13 @@ msgid ""
 "Incoming."
 msgstr ""
 "Virtualios šio produkto atsargos pagal pasirinktą vietą arba visas kiekis, "
-"jei vieta nėra pasirinkta. Skaičiuojama : Tikros atsargos - Išsiunčiamos "
-"atsargos + Gaunamos atsargos."
+"jei vieta nėra pasirinkta. Skaičiuojama : Tikros atsargos - Išvykstančios "
+"prekės + Atvykstančios prekės."
 
 #. module: product
 #: field:product.packaging,width:0
 msgid "Width"
-msgstr ""
+msgstr "Plotis"
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
@@ -113,7 +114,7 @@ msgstr ""
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Gavimo būdas"
 
 #. module: product
 #: constraint:ir.actions.act_window:0
@@ -123,17 +124,17 @@ msgstr ""
 #. module: product
 #: model:process.process,name:product.process_process_productprocess0
 msgid "Product Process"
-msgstr "Produkto procesas"
+msgstr "Produktų procesas"
 
 #. module: product
 #: help:product.price.type,field:0
 msgid "Associated field in the product form."
-msgstr "Susijęs laukas, produkto formoje"
+msgstr "Susijęs laukas produkto formoje."
 
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Standard Price"
-msgstr ""
+msgstr "Standartinė kaina"
 
 #. module: product
 #: help:product.packaging,height:0
@@ -143,12 +144,12 @@ msgstr "Pakuotės aukštis"
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price List"
-msgstr ""
+msgstr "Produktų kainoraštis"
 
 #. module: product
 #: model:product.category,name:product.cat1
 msgid "Sellable"
-msgstr "Parduodamas"
+msgstr "Parduodami"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -158,57 +159,55 @@ msgstr "Klaviatūra + pelė"
 #. module: product
 #: field:product.price.type,name:0
 msgid "Price Name"
-msgstr ""
+msgstr "Kainos pavadinimas"
 
 #. module: product
 #: field:product.product,price:0
 msgid "Customer Price"
-msgstr ""
+msgstr "Pirkėjo kaina"
 
 #. module: product
 #: field:product.template,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Įmonė"
 
 #. module: product
 #: field:product.template,rental:0
 msgid "Rentable Product"
-msgstr ""
+msgstr "Galima nuomoti"
 
 #. module: product
 #: field:product.product,lst_price:0
 msgid "List Price"
-msgstr ""
+msgstr "Pardavimo kaina"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
 #: model:ir.ui.menu,name:product.menu_product_price_type_action
 msgid "Prices Types"
-msgstr ""
+msgstr "Kainų tipai"
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr ""
+msgstr "Sandėliuojamas produktas"
 
 #. module: product
 #: model:product.category,name:product.product_category_services
 msgid "Services"
-msgstr ""
+msgstr "Paslaugos"
 
 #. module: product
 #: help:product.template,list_price:0
 msgid ""
 "Base price for computing the customer price. Sometimes called the catalog "
 "price."
-msgstr ""
-"Bazinė kaina, skirta apskaičiuoti pirkėjo kainai. Kartais vadinama katalogo "
-"kaina."
+msgstr "Bazinė kaina suskaičiuoti pardavimo kainą."
 
 #. module: product
 #: field:pricelist.partnerinfo,min_quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Kiekis"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
@@ -223,23 +222,23 @@ msgstr "Šios kainos rūšies pavadinimas."
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "Starting date for this pricelist version to be valid."
-msgstr ""
+msgstr "Pradžios data šiai galiojančiai kainoraščio versijai."
 
 #. module: product
 #: field:product.product,incoming_qty:0
 msgid "Incoming"
-msgstr "Gaunama"
+msgstr "Atvykstančios prekės"
 
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Iš sandėlio"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Weigths"
-msgstr "Svoriai"
+msgstr "Gabenimo matai"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
@@ -252,29 +251,29 @@ msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Purchase will trigger purchase orders when requested."
 msgstr ""
-"Gaminti sukurs gamybos užsakymus arba užduotis, priklausomai nuo produkto "
-"tipo. Pirkimas sukurs pirkimo užsakymus pagal pareikalavimą."
+"„Gamyba“ sukurs gamybos užsakymą arba užduotis, atsižvelgiant į produkto "
+"tipą. „Pirkimas“ sukurs pirkimo užsakymą."
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
 msgid "You can see the list of suppliers for that product."
-msgstr ""
+msgstr "Jūs galite matyti sąrašą tiekėjų šiam produktui."
 
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layer on a palet or box"
-msgstr "Sluoksnių skaičius paletėje arba dėžėje"
+msgstr "Keliais sluoksniais sukrauti produktai paletėje ar dėžėje"
 
 #. module: product
 #: model:product.pricelist.type,name:product.pricelist_type_sale
 #: field:res.partner,property_product_pricelist:0
 msgid "Sale Pricelist"
-msgstr ""
+msgstr "Pardavimų kainoraštis"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
 msgid "If Other Pricelist"
-msgstr ""
+msgstr "Jeigu kitas kainoraštis"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_normal_action
@@ -296,17 +295,17 @@ msgstr ""
 #. module: product
 #: view:product.pricelist.item:0
 msgid "New Price ="
-msgstr ""
+msgstr "Nauja kaina ="
 
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Virtual Stock"
-msgstr ""
+msgstr "Virtualios atsargos"
 
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Fiksuotas"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
@@ -321,14 +320,14 @@ msgid ""
 "products"
 msgstr ""
 "Nustatyti produktą, jeigu taisyklė galioja tik šiam produktui. Palikti "
-"tuščią, kad galiotų visiems produktams."
+"tuščią visiems produktams."
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
 #: field:product.pricelist,type:0
 #: view:product.pricelist.type:0
 msgid "Pricelist Type"
-msgstr ""
+msgstr "Kainoraščio tipas"
 
 #. module: product
 #: view:product.product:0
@@ -339,12 +338,12 @@ msgstr "Bazinės kainos"
 #. module: product
 #: model:ir.ui.menu,name:product.menu_price
 msgid "Prices Computations"
-msgstr "Kainų skaičiavimai"
+msgstr "Kainų skaičiavimas"
 
 #. module: product
 #: field:product.pricelist.item,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Taisyklės pavadinimas"
 
 #. module: product
 #: model:ir.ui.menu,name:product.menu_config_product
@@ -354,22 +353,22 @@ msgstr "Nustatymai"
 #. module: product
 #: field:product.packaging,rows:0
 msgid "Number of Layer"
-msgstr "Sluoksnio numeris"
+msgstr "Sluoksnių kiekis"
 
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr "Klaida! Negalima sukurti rekursinių kategorijų."
+msgstr "Klaida ! Negalima sukurti pasikartojančių kategorijų."
 
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default UoM"
-msgstr "Numatytas mat. vnt."
+msgstr "Numatytasis mato vnt."
 
 #. module: product
 #: field:product.template,produce_delay:0
 msgid "Manufacturing Lead Time"
-msgstr "Gamybos trukmė"
+msgstr "Gamybos užsakymo atlikimo laikas"
 
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
@@ -380,12 +379,12 @@ msgstr "Tiekėjo kainoraštis"
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Pallet Dimension"
-msgstr ""
+msgstr "Pakuotės matmenys"
 
 #. module: product
 #: field:product.pricelist.item,base:0
 msgid "Based on"
-msgstr "Pagrįstas"
+msgstr "Bazė"
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
@@ -395,12 +394,12 @@ msgstr "Klaviatūra"
 #. module: product
 #: field:product.supplierinfo,name:0
 msgid "Partner"
-msgstr ""
+msgstr "Partneris"
 
 #. module: product
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr "Pristatymo pirkėjui trukmė"
+msgstr "Užsakymo pristatymo laikas"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
@@ -426,12 +425,12 @@ msgstr "Kainoraščio pavadinimas"
 #. module: product
 #: field:product.template,seller_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Partneriai"
 
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
-msgstr ""
+msgstr "Vidutinė kaina"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
@@ -446,7 +445,7 @@ msgstr "Šio kainoraščio eilutės taisyklės pavadinimas."
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Min. Margin"
-msgstr ""
+msgstr "Min. skirtumas"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -461,7 +460,7 @@ msgstr "Procesorius AMD Athlon XP 1800+"
 #. module: product
 #: selection:product.template,state:0
 msgid "In Production"
-msgstr ""
+msgstr "Gaminamas"
 
 #. module: product
 #: field:product.category,child_id:0
@@ -476,7 +475,7 @@ msgstr "Priedai"
 #. module: product
 #: field:product.supplierinfo,sequence:0
 msgid "Priority"
-msgstr ""
+msgstr "Svarbumas"
 
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
@@ -487,12 +486,12 @@ msgstr "HDD pagal poreikį"
 #: field:product.uom,factor_inv:0
 #: field:product.uom,factor_inv_data:0
 msgid "Factor"
-msgstr ""
+msgstr "Rodiklis"
 
 #. module: product
 #: wizard_button:product.price_list,init,price:0
 msgid "Print"
-msgstr ""
+msgstr "Spausdinti"
 
 #. module: product
 #: model:process.node,name:product.process_node_supplier0
@@ -502,7 +501,7 @@ msgstr "Tiekėjo informacija"
 #. module: product
 #: field:product.ul,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipas"
 
 #. module: product
 #: wizard_field:product.price_list,init,price_list:0
@@ -513,19 +512,19 @@ msgstr "Kainoraštis"
 #: view:product.product:0
 #: view:product.template:0
 msgid "UOM"
-msgstr "Mat. vnt."
+msgstr "Matai"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
 msgid "PCE"
-msgstr "VNT"
+msgstr "Vnt"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action2
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action2
 #: model:ir.ui.menu,name:product.menu_product_pricelist_main
 msgid "Pricelists"
-msgstr ""
+msgstr "Kainoraščiai"
 
 #. module: product
 #: field:product.supplierinfo,product_name:0
@@ -554,7 +553,7 @@ msgstr "Mato vienetai"
 #. module: product
 #: field:product.product,partner_ref:0
 msgid "Customer ref"
-msgstr ""
+msgstr "Kliento nuoroda"
 
 #. module: product
 #: field:product.supplierinfo,qty:0
@@ -572,12 +571,14 @@ msgid ""
 "This is the average delay in days between the purchase order confirmation "
 "and the reception of goods for this product and for the default supplier. It "
 "is used by the scheduler to order requests based on reordering delays."
-msgstr "Tai"
+msgstr ""
+"Tai yra laiko skirtumas tarp pirkimo užsakymo patvirtinimo ir prekių "
+"pristatymo. Šis skirtumas naudojamas planuoti užsakymus."
 
 #. module: product
 #: field:product.template,seller_delay:0
 msgid "Supplier Lead Time"
-msgstr "Tiekėjo pristatymo trukmė"
+msgstr "Tiekimo vėlavimo laikas"
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -587,57 +588,55 @@ msgstr ""
 #. module: product
 #: field:product.pricelist.type,key:0
 msgid "Key"
-msgstr ""
+msgstr "Raktas"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
 msgid "Price List Version"
-msgstr ""
+msgstr "Kainoraščio versija"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Rules Test Match"
-msgstr ""
+msgstr "Taisyklių testų atitikimai"
 
 #. module: product
 #: help:res.partner,property_product_pricelist:0
 msgid ""
 "This pricelist will be used, instead of the default one,                     "
 "for sales to the current partner"
-msgstr ""
-"Šis kainoraštis bus naudojamas vietoje numatytojo, parduodant pasirinktajam "
-"partneriui"
+msgstr "Šis kainoraštis bus naudojamas vietoj numatytojo."
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist
 #: view:product.supplierinfo:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Kainoraštis"
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
-msgstr ""
+msgstr "Suvartojamas"
 
 #. module: product
 #: help:product.price.type,currency_id:0
 msgid "The currency the field is expressed in."
-msgstr "Valiuta, kuria išreikštas laukas"
+msgstr "Šio kainos tipo valiuta."
 
 #. module: product
 #: help:product.template,weight:0
 msgid "The gross weight in Kg."
-msgstr "Bendrasis svoris išreikštas Kg"
+msgstr "Bendras produkto svoris išreiktas kilogramais (su pakavimu)."
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Box"
-msgstr ""
+msgstr "Dėžė"
 
 #. module: product
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Netinkamas XML vaizdo architektūrai !"
+msgstr "Netinkamas XML peržiūros strūkturai!"
 
 #. module: product
 #: help:product.template,sale_ok:0
@@ -645,7 +644,8 @@ msgid ""
 "Determine if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
-"Ar produktas bus matomas kuriant pardavimų užsakymo eilutę produktų sąraše."
+"Pažymėkite, jeigu norite, kad šis produktas būtų matomas parduodamų produktų "
+"sąraše."
 
 #. module: product
 #: constraint:product.template:0
@@ -656,12 +656,12 @@ msgstr ""
 #. module: product
 #: field:product.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Aukštesnioji kategorija"
 
 #. module: product
 #: selection:product.template,state:0
 msgid "In Development"
-msgstr ""
+msgstr "Kuriamas"
 
 #. module: product
 #: help:product.pricelist.type,key:0
@@ -669,8 +669,8 @@ msgid ""
 "Used in the code to select specific prices based on the context. Keep "
 "unchanged."
 msgstr ""
-"Naudojamas kode parenkant konkrečias kainas atsižvelgiant į kontekstą. "
-"Palikti nepakeistą."
+"Šis kodas naudojamas apskaičiuoti specifines kainas remiantis dokumentų "
+"turiniu. Prašome jo nekeisti."
 
 #. module: product
 #: help:product.product,outgoing_qty:0
@@ -691,18 +691,21 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
+"„Iš sandėlio“: produktą paimti iš sandėlio arba palaukti kol sandėlyje "
+"pasipildys atsargos. „Pateikus užsakymą“: nupirkti arba pagaminti produktą "
+"pagal gautą užsakymą."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
-msgstr ""
+msgstr "Užsakymo planavimas"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_product_category_action
 msgid "Products by Category"
-msgstr ""
+msgstr "Produktai pagal kategorijas"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -725,7 +728,7 @@ msgstr "HDD Seagate 7200.8 160GB"
 #. module: product
 #: view:product.product:0
 msgid "Product Variant"
-msgstr ""
+msgstr "Produkto variantas"
 
 #. module: product
 #: field:product.packaging,ul:0
@@ -740,34 +743,34 @@ msgstr "Lentyna"
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr "Mat. vnt. kategorija"
+msgstr "Mato vnt. kategorija"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pack"
-msgstr ""
+msgstr "Paketas"
 
 #. module: product
 #: field:product.product,ean13:0
 msgid "EAN13"
-msgstr ""
+msgstr "EAN13"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_sale:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Pardavimo aprašymas"
 
 #. module: product
 #: field:product.template,uos_id:0
 msgid "Unit of Sale"
-msgstr ""
+msgstr "Pardavimo vienetas"
 
 #. module: product
 #: field:product.template,mes_type:0
 msgid "Measure Type"
-msgstr "Matavimo tipas"
+msgstr "Matavimo būdas"
 
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
@@ -785,13 +788,13 @@ msgid ""
 "Name of the product for this partner, will be used when printing a request "
 "for quotation. Keep empty to use the internal one."
 msgstr ""
-"Produkto pavadinimas, kuris bus naudojamas partneriams spausdinant "
-"užsakymus. Nepildomas, jeigu norima naudoti vidinį pavadinimą."
+"Šis produkto pavadinimas naudojamas spausdinant tiekėjui užsakymo dokumentą. "
+"Palikus laukelį tuščią bus parenkamas pagrindinis produkto pavadinimas."
 
 #. module: product
 #: field:product.template,supply_method:0
 msgid "Supply method"
-msgstr ""
+msgstr "Tiekimo būdas"
 
 #. module: product
 #: model:product.category,name:product.product_category_11
@@ -801,19 +804,19 @@ msgstr "IT komponentų rinkiniai"
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr "Matavimo vienetų kategorijos"
+msgstr "Mato vienetų kategorijos"
 
 #. module: product
 #: field:product.category,sequence:0
 #: field:product.packaging,sequence:0
 #: field:product.pricelist.item,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seka"
 
 #. module: product
 #: view:product.supplierinfo:0
 msgid "Supplier Information"
-msgstr "Tiekėjo informacija"
+msgstr "Informacija apie tiekėjus"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_ul_form_action
@@ -823,13 +826,13 @@ msgstr "Tiekėjo informacija"
 #: view:product.product:0
 #: view:product.ul:0
 msgid "Packaging"
-msgstr ""
+msgstr "Pakavimas"
 
 #. module: product
 #: field:product.price.type,currency_id:0
 #: field:product.pricelist,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valiuta"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
@@ -840,17 +843,17 @@ msgstr "Įprasta procesoriaus konfigūracija"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Descriptions"
-msgstr ""
+msgstr "Aprašymai"
 
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Suppliers of Product"
-msgstr ""
+msgstr "Produkto tiekėjas"
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Pradžios data"
 
 #. module: product
 #: view:res.partner:0
@@ -863,8 +866,8 @@ msgid ""
 "Current quantities of products in selected locations or all internal if none "
 "have been selected."
 msgstr ""
-"Dabartinis produktų kiekis parinktose vietose arba visose vidinėse, jei "
-"jokia neparinkta."
+"Dabartinis produktų kiekis pasirinktoje vietoje arba visas kiekis, jei nė "
+"viena vieta nebuvo pasirinkta."
 
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
@@ -879,7 +882,7 @@ msgstr "Eilė"
 #. module: product
 #: field:product.template,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #. module: product
 #: help:product.pricelist.item,min_quantity:0
@@ -895,12 +898,12 @@ msgstr "DDR 256MB PC400"
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Real Stock"
-msgstr ""
+msgstr "Tikros atsargos"
 
 #. module: product
 #: view:product.category:0
 msgid "Product Categories"
-msgstr ""
+msgstr "Produkto kategorijos"
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -908,16 +911,18 @@ msgid ""
 "Unit of Measure of a category can be converted between each others in the "
 "same category."
 msgstr ""
+"Kategorijoje esantys mato vnt. gali būti konvertuojamas į kitus esančius "
+"toje pačioje kategorijoje."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Produkto mato vienetas"
 
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be sold"
-msgstr ""
+msgstr "Galima parduoti"
 
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
@@ -929,8 +934,8 @@ msgstr "Pilnas PK su papildoma įranga"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
-"Klaida: numatytasis mat. vnt. ir pirkimo mat. vnt. turi būti toje pačioje "
-"kategorijoje."
+"Klaida: Numatytasis mato vnt. ir pirkimo mato vnt. turi būti tos pačios "
+"kategorijos."
 
 #. module: product
 #: model:product.template,name:product.product_product_mb2_product_template
@@ -940,17 +945,17 @@ msgstr "Pagrindinė plokštė ASUStek A7V8X-X"
 #. module: product
 #: field:product.uom,factor:0
 msgid "Rate"
-msgstr ""
+msgstr "Koeficientas"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Products Listprices Items"
-msgstr ""
+msgstr "Produktų kainoraščio elementai"
 
 #. module: product
 #: field:product.uom,rounding:0
 msgid "Rounding Precision"
-msgstr ""
+msgstr "Apvalinimo tikslumas"
 
 #. module: product
 #: help:product.packaging,width:0
@@ -974,31 +979,31 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr "Pirkimai ir vietos"
+msgstr "Vieta ir terminai"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,state:0
 msgid "Status"
-msgstr ""
+msgstr "Būsena"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Išvykstančios prekės"
 
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Buy"
-msgstr ""
+msgstr "Pirkimas"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
 #: view:product.pricelist:0
 #: view:product.pricelist.version:0
 msgid "Pricelist Version"
-msgstr ""
+msgstr "Kainoraščio versija"
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -1008,17 +1013,17 @@ msgstr "Kainos apvalinimas"
 #. module: product
 #: model:product.price.type,name:product.list_price
 msgid "Public Price"
-msgstr "Viešoji kaina"
+msgstr "Galutinė kaina"
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
 msgid "Max. Price Margin"
-msgstr ""
+msgstr "Maks. kainos marža"
 
 #. module: product
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Pardavimai ir pirkimai"
+msgstr "Pirkimai ir pardavimai"
 
 #. module: product
 #: model:product.category,name:product.product_category_10
@@ -1028,27 +1033,27 @@ msgstr "IT komponentai"
 #. module: product
 #: help:product.packaging,weight_ul:0
 msgid "The weight of the empty UL"
-msgstr ""
+msgstr "Tuščio logistinio vieneto svoris"
 
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
-msgstr ""
+msgstr "Transporto vieneto kodas"
 
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase UoM"
-msgstr "Pirkimų mat. vnt."
+msgstr "Pirkimo mato vnt."
 
 #. module: product
 #: view:product.price.type:0
 msgid "Products Price Type"
-msgstr ""
+msgstr "Produktų kainos tipas"
 
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
-msgstr ""
+msgstr "Produkto vadybininkas"
 
 #. module: product
 #: field:product.product,price_extra:0
@@ -1063,7 +1068,7 @@ msgstr "Įprasto korpuso ventiliatorius 80 mm"
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
 msgid "Information about a product supplier"
-msgstr ""
+msgstr "Informacija apie produkto tiekėją"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1072,7 +1077,7 @@ msgstr ""
 #: field:product.product,active:0
 #: field:product.uom,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktyvus"
 
 #. module: product
 #: field:product.product,price_margin:0
@@ -1092,26 +1097,26 @@ msgstr "Vidutinis PK"
 #. module: product
 #: model:ir.model,name:product.model_pricelist_partnerinfo
 msgid "pricelist.partnerinfo"
-msgstr ""
+msgstr "Partnerių informacija"
 
 #. module: product
 #: model:product.price.type,name:product.standard_price
 #: field:product.template,standard_price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Savikaina"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_purchase:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Pirkimo aprašymas"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr "Antras mat. vnt."
+msgstr "Antriniai matai"
 
 #. module: product
 #: model:product.category,name:product.product_category_4
@@ -1122,7 +1127,7 @@ msgstr "Dello kompiuteris"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Localisation"
-msgstr "Vieta sandėlyje"
+msgstr "Laikymo vieta"
 
 #. module: product
 #: help:product.packaging,length:0
@@ -1137,12 +1142,12 @@ msgstr ""
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr "Pakuotės EAN kodas"
+msgstr "Logistinio vieneto EAN kodas"
 
 #. module: product
 #: field:product.template,weight:0
 msgid "Gross weight"
-msgstr ""
+msgstr "Bruto svoris"
 
 #. module: product
 #: help:product.product,packaging:0
@@ -1150,30 +1155,30 @@ msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the packing order and is mainly used if you use the EDI module."
 msgstr ""
-"Galimybė naudoti skirtingas pakuotes tam pačiam produktui. Neturi jokios "
-"įtakos pakavimo užsakymams, naudojama kartu su EDI moduliu."
+"Nurodo skirtingas produkto pakuotes. Dažniausiai naudojama kartu su EDI "
+"moduliu."
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Produkto kategorija"
 
 #. module: product
 #: field:product.price.type,field:0
 msgid "Product Field"
-msgstr ""
+msgstr "Produkto laukas"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_type_action
 #: model:ir.ui.menu,name:product.menu_product_pricelist_type_action
 msgid "Pricelists Types"
-msgstr ""
+msgstr "Kainoraščių tipai"
 
 #. module: product
 #: help:product.template,state:0
 msgid "Tells the user if he can use the product or not."
-msgstr "Nurodo vartotojui ar jis gali naudoti produktą"
+msgstr "Naudotojui parodoma ar galima naudoti šį produktą."
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
@@ -1190,7 +1195,7 @@ msgstr "Kompiuterinė įranga"
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Code"
-msgstr ""
+msgstr "Kodas"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -1198,11 +1203,13 @@ msgid ""
 "The coefficient for the formula:\n"
 "coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
 msgstr ""
+"Formulės koeficientas:\n"
+" koef (šis vnt.) = 1 (bazinis vnt.). Rodiklis = 1 / koeficientas."
 
 #. module: product
 #: view:product.supplierinfo:0
 msgid "Seq"
-msgstr ""
+msgstr "Seka"
 
 #. module: product
 #: model:product.category,name:product.product_category_8
@@ -1212,13 +1219,14 @@ msgstr "Pagalba telefonu"
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Variable"
-msgstr ""
+msgstr "Kintantis"
 
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
 msgstr ""
-"Numatytasis mato vienetas, kuris bus naudojamas visose sandėlio operacijose."
+"Šis mato vnt. pagal nutylėjimą bus parenkamas visoms operacijose su "
+"atsargomis."
 
 #. module: product
 #: model:ir.model,name:product.model_product_template
@@ -1226,7 +1234,7 @@ msgstr ""
 #: field:product.product,product_tmpl_id:0
 #: view:product.template:0
 msgid "Product Template"
-msgstr ""
+msgstr "Produkto šablonas"
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
@@ -1239,11 +1247,13 @@ msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for products "
 "that can not be split."
 msgstr ""
+"Skaičiuojami kiekiai bus apvalinamas pagal šią reikšmę. Nedalomiems "
+"produktams naudokite 1.0"
 
 #. module: product
 #: field:product.packaging,height:0
 msgid "Height"
-msgstr ""
+msgstr "Aukštis"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
@@ -1258,14 +1268,14 @@ msgstr ""
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
 msgid "Partner Information"
-msgstr ""
+msgstr "Partnerio informacija"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,type:0
 msgid "Product Type"
-msgstr ""
+msgstr "Produkto tipas"
 
 #. module: product
 #: model:product.category,name:product.product_category_7
@@ -1281,29 +1291,28 @@ msgstr "Visi produktai"
 #. module: product
 #: wizard_button:product.price_list,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by palet or box."
-msgstr ""
-"Bendras produktų skaičius, kurį galima padėti ant paletės arba į dėžę."
+msgstr "Bendras produktų kiekis, kurį galima sudėtį ant paletės ar į dėžę"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
 msgid "Pricelist item"
-msgstr ""
+msgstr "Kainoraščio prekė"
 
 #. module: product
 #: model:ir.actions.wizard,name:product.report_wizard_price
 #: field:product.pricelist.version,pricelist_id:0
 msgid "Price List"
-msgstr ""
+msgstr "Kainoraštis"
 
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
-msgstr "Viešasis kainoraštis"
+msgstr "Viešas kainoraštis"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
@@ -1314,7 +1323,7 @@ msgstr "RAM pagal poreikį"
 #: selection:product.ul,type:0
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
-msgstr ""
+msgstr "Vienetas"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd2_product_template
@@ -1330,20 +1339,19 @@ msgstr "Kiekis-2"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: product
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "Kodai"
 
 #. module: product
 #: 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 negali turėti jokių specialiųjų "
-"ženklų !"
+"Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių!"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty4:0
@@ -1359,18 +1367,18 @@ msgstr "Kiekis-5"
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Other Info"
-msgstr ""
+msgstr "Kita informacija"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Delays"
-msgstr "Vėlavimai"
+msgstr "Terminai"
 
 #. module: product
 #: field:product.pricelist.version,items_id:0
 msgid "Price List Items"
-msgstr ""
+msgstr "Kainoraščio elementai"
 
 #. module: product
 #: help:product.supplierinfo,product_code:0
@@ -1378,13 +1386,13 @@ msgid ""
 "Code of the product for this partner, will be used when printing a request "
 "for quotation. Keep empty to use the internal one."
 msgstr ""
-"Produkto kodas, skirtas partneriui, bus naudojamas spausdinant užsakymą. "
-"Nepildykite norėdami naudoti vidinį kodą."
+"Šis produkto kodas naudojamas spausdinant partnerio užsakymo dokumentą. "
+"Palikus laukelį tuščią bus parenkamas pagrindinis produkto kodas."
 
 #. module: product
 #: selection:product.template,state:0
 msgid "Obsolete"
-msgstr ""
+msgstr "Pasenęs"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1394,17 +1402,17 @@ msgstr ""
 #. module: product
 #: field:pricelist.partnerinfo,price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Vieneto kaina"
 
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty (months)"
-msgstr ""
+msgstr "Garantija (mėnesiai)"
 
 #. module: product
 #: field:product.packaging,ul_qty:0
 msgid "Package by layer"
-msgstr "Pakuotė pagal sluoksnį"
+msgstr "Pakuotės sluoksnis"
 
 #. module: product
 #: help:product.template,type:0
@@ -1417,12 +1425,12 @@ msgstr ""
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Product suppliers, with their product name, price, etc."
-msgstr "Produkto tiekėjai, produkto tiekėjų pavadinimai, kainos, kita."
+msgstr "Produkto tiekėjai su savo produkto pavadinimu, kaina ir pan."
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
 msgid "Price type"
-msgstr ""
+msgstr "Kainos tipas"
 
 #. module: product
 #: model:ir.model,name:product.model_product_product
@@ -1433,12 +1441,12 @@ msgstr ""
 #: field:product.supplierinfo,product_id:0
 #: model:res.request.link,name:product.req_link_product
 msgid "Product"
-msgstr ""
+msgstr "Produktas"
 
 #. module: product
 #: field:product.template,volume:0
 msgid "Volume"
-msgstr ""
+msgstr "Tūris"
 
 #. module: product
 #: field:pricelist.partnerinfo,name:0
@@ -1447,12 +1455,12 @@ msgstr ""
 #: view:product.template:0
 #: field:product.template,description:0
 msgid "Description"
-msgstr ""
+msgstr "Aprašymas"
 
 #. module: product
 #: field:product.packaging,ean:0
 msgid "EAN"
-msgstr ""
+msgstr "EAN"
 
 #. module: product
 #: view:product.product:0
@@ -1472,11 +1480,13 @@ msgid ""
 "the delivery of the finished products. It's the time you promise to your "
 "customers."
 msgstr ""
+"Vidutinis dienų skaičius praeisiantis nuo kliento užsakymo patvirtinimo iki "
+"produkto pristatymo. Tai laikas, kurį pažadėsite savo klientams."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr ""
+msgstr "Produkto mato vieneto kategorija"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty3:0
@@ -1491,12 +1501,12 @@ msgstr ""
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Produce"
-msgstr ""
+msgstr "Gamyba"
 
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Order"
-msgstr ""
+msgstr "Pateikus užsakymą"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
@@ -1511,17 +1521,17 @@ msgstr ""
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Rounding Method"
-msgstr ""
+msgstr "Apvalinimo metodas"
 
 #. module: product
 #: field:product.product,variants:0
 msgid "Variants"
-msgstr ""
+msgstr "Variantai"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Price Computation"
-msgstr ""
+msgstr "Kainos skaičiavimas"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
@@ -1531,18 +1541,18 @@ msgstr "Pagrindinė plokštė ASUStek A7N8X"
 #. module: product
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr ""
+msgstr "Dėžė"
 
 #. module: product
 #: field:product.pricelist.version,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Pabaigos data"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
 msgid "Products Categories"
-msgstr ""
+msgstr "Produktų kategorijos"
 
 #. module: product
 #: field:product.product,packaging:0
@@ -1559,7 +1569,7 @@ msgstr "Logistinis vienetas"
 #: field:product.uom,name:0
 #: field:product.uom.categ,name:0
 msgid "Name"
-msgstr ""
+msgstr "Pavadinimas"
 
 #. module: product
 #: help:product.template,uos_coeff:0
@@ -1567,18 +1577,18 @@ msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uom = uos * coeff"
 msgstr ""
-"Koeficientas konvertuoti matavimo vnt. į pardavimo matavimo vnt.  mat. vnt. "
-"= pard. mat. vnt. * koef"
+"Koeficientą konvertuoti iš mato vnt. į pardavimo mato vnt.\n"
+" mato vnt. = pard. mato vnt. * koef"
 
 #. module: product
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr ""
+msgstr "Galima pirkti"
 
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "UOM -> UOS Coeff"
-msgstr "Mat. vnt -> Pardavimo mat. vnt. koeficientas"
+msgstr "Mato vnt. -> Pardavimo mato vnt. koeficientas"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu2_product_template
@@ -1593,34 +1603,34 @@ msgstr "Bazinis PK (surinkti pagal užsakymą)"
 #. module: product
 #: field:product.template,cost_method:0
 msgid "Costing Method"
-msgstr ""
+msgstr "Įkainojimo būdas"
 
 #. module: product
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Palletization"
-msgstr ""
+msgstr "Pakuotės struktūra"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Prices & Suppliers"
-msgstr "Kainos ir tiekėjai"
+msgstr "Tiekėjai ir kainos"
 
 #. module: product
 #: help:product.packaging,weight:0
 msgid "The weight of a full of products palet or box."
-msgstr "Pilnos produktų paletės arba dėžes svoris."
+msgstr "Pilnai pakrautos paletės ar dėžės svoris"
 
 #. module: product
 #: selection:product.template,state:0
 msgid "End of Lifecycle"
-msgstr ""
+msgstr "Gyvavimo ciklo pabaiga"
 
 #. module: product
 #: model:ir.module.module,shortdesc:product.module_meta_information
 msgid "Products & Pricelists"
-msgstr ""
+msgstr "Produktai ir kainoraščiai"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -1628,11 +1638,13 @@ msgid ""
 "The coefficient for the formula:\n"
 "1 (base unit) = coeff (this unit). Rate = 1 / Factor."
 msgstr ""
+"Formulės koeficientas:\n"
+"1 (bazinis vnt.) = koef (šis vnt.). Koeficiantas = 1 / rodiklis."
 
 #. module: product
 #: help:product.template,weight_net:0
 msgid "The net weight in Kg."
-msgstr "Grynasis svoris kilogramais."
+msgstr "Grynas produkto svoris išreiktas kilogramais (be pakavimo)."
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
@@ -1642,14 +1654,14 @@ msgstr "ATX vidutinio dydžio korpusas"
 #. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Delay"
-msgstr "Pristatymo vėlalvimas"
+msgstr "Pristatymo laikas"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action
 #: field:product.pricelist,version_id:0
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Kainoraščio versijos"
 
 #. module: product
 #: field:product.packaging,weight_ul:0
@@ -1669,6 +1681,9 @@ msgid ""
 "this product. Different delays will be summed for all levels and purchase "
 "orders."
 msgstr ""
+"Vidutinis dienų skaičius reikalingas pagaminti produktą. Jis naudojamas tik "
+"gamybos užsakymams. Jeigu šis produktas yra tik sudedamoji pagrindinio "
+"produkto dalis, tuomet laikas bus pridedamas prie bendro laiko."
 
 #. module: product
 #: wizard_field:product.price_list,init,qty1:0
@@ -1678,7 +1693,7 @@ msgstr "Kiekis-1"
 #. module: product
 #: field:product.packaging,length:0
 msgid "Length"
-msgstr ""
+msgstr "Ilgis"
 
 #. module: product
 #: model:product.category,name:product.cat2
@@ -1692,9 +1707,8 @@ msgid ""
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
 msgstr ""
-"Trukmė dienomis tarp pirkimo užsakymo patvirtinimo ir prekių gavimo į jūsų "
-"sandėlį. Naudojama, kai planavimo metu automatiškai kuriami pirkimų "
-"užsakymai."
+"Tai yra laiko skirtumas dienomis tarp pirkimo užsakymo patvirtinimo ir "
+"prekių pristatymo. Šis skirtumas naudojamas planuoti užsakymus."
 
 #. module: product
 #: help:product.template,uom_po_id:0
@@ -1702,8 +1716,8 @@ msgid ""
 "Default Unit of Measure used for purchase orders. It must in the same "
 "category than the default unit of measure."
 msgstr ""
-"Pagal nutylėjimą  pirkimų užsakymuose naudojamas  mato vienetas. Turi būti "
-"toje pačioje kategorijoje kaip ir numatytasis produkto mato vienetas."
+"Šis mato vnt. pagal nutylėjimą bus parenkamas visiems pirkimo užsakymams. "
+"Jis turi priklausyti tai pačiai kategorijai kaip ir numatytasis mato vnt."
 
 #. module: product
 #: constraint:product.product:0
@@ -1713,7 +1727,7 @@ msgstr "Klaida: Netinkamas EAN kodas"
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
 msgid "Min. Quantity"
-msgstr ""
+msgstr "Min. kiekis"
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -1721,6 +1735,8 @@ msgid ""
 "Set a category of product if this rule only apply to products of a category "
 "and his childs. Keep empty for all products"
 msgstr ""
+"Pasirinkti produkto kategoriją, jeigu taisyklė susijusi su šia kategorija. "
+"Palikti tuščią, jeigu taisyklė naudojama visiems produktams."
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
@@ -1730,7 +1746,7 @@ msgstr "Produktų etiketės"
 #. module: product
 #: help:product.template,volume:0
 msgid "The volume in m3."
-msgstr "Apimtis išreikšta m3"
+msgstr "Tūris išreikštas kubiniais metrais."
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
@@ -1745,4 +1761,52 @@ msgstr "KG"
 #. module: product
 #: field:product.pricelist.item,price_discount:0
 msgid "Price Discount"
-msgstr ""
+msgstr "Kainos nuolaida"
+
+#, python-format
+#~ msgid "Products: "
+#~ msgstr "Produktai: "
+
+#, python-format
+#~ msgid "Partner section of the product form"
+#~ msgstr "Produkto formos partnerio sekcija"
+
+#, python-format
+#~ msgid "Other Pricelist"
+#~ msgstr "Kitas kainoraštis"
+
+#, python-format
+#~ msgid "%d units"
+#~ msgstr "%d vnt."
+
+#, python-format
+#~ msgid "%d unit"
+#~ msgstr "%d vnt."
+
+#~ msgid ""
+#~ "Used by companies that manages two unit of measure: invoicing and stock "
+#~ "management. For example, in food industries, you will manage a stock of ham "
+#~ "but invoice in Kg. Keep empty to use the default UOM."
+#~ msgstr ""
+#~ "Šis mato vnt. naudojamas kompanijų, kurioms reikalingi skirtingi mato vnt. "
+#~ "pirkimams bei pardavimams. Palikus tuščią laukelį, bus naudojamas "
+#~ "numatytasis mato vnt."
+
+#~ msgid "You can not have 2 pricelist version that overlaps!"
+#~ msgstr "Jūs negalite turėti 2 kainoraščių versijų, kurios sutampa!"
+
+#~ msgid ""
+#~ "Will change the way procurements are processed. Consumables are stockable "
+#~ "products with infinite stock, or for use when you have no stock management "
+#~ "in the system."
+#~ msgstr ""
+#~ "Pasirinkti būda, kuriuo bus apdorojami užsakymai. Tipą „Suvartojamas“ "
+#~ "naudokite sandėliuojamiems produktams su nesibaigiančiomis atsargomis ar be "
+#~ "atsargų valdymo kontrolės."
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Įspėjimas!"
+
+#~ msgid "Price List Name :"
+#~ msgstr "Kainoraščio pavadinimas :"
diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po
index 69373408224..b7774f7f693 100644
--- a/addons/product/i18n/nl_BE.po
+++ b/addons/product/i18n/nl_BE.po
@@ -1,19 +1,21 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* product
+# Dutch (Belgium) 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: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:34:15+0000\n"
-"PO-Revision-Date: 2009-08-28 15:34:15+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"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"
+"PO-Revision-Date: 2010-07-20 11:58+0000\n"
+"Last-Translator: Niels Huylebroeck <Unknown>\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: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -27,7 +29,9 @@ msgstr ""
 
 #. module: product
 #: help:product.template,standard_price:0
-msgid "The cost of the product for accounting stock valuation. It can serves as a base price for supplier price."
+msgid ""
+"The cost of the product for accounting stock valuation. It can serves as a "
+"base price for supplier price."
 msgstr ""
 
 #. module: product
@@ -37,7 +41,9 @@ msgstr ""
 
 #. module: product
 #: help:product.template,purchase_ok:0
-msgid "Determine if the product is visible in the list of products within a selection from a purchase order line."
+msgid ""
+"Determine if the product is visible in the list of products within a "
+"selection from a purchase order line."
 msgstr ""
 
 #. module: product
@@ -57,7 +63,9 @@ msgstr ""
 
 #. module: product
 #: help:product.supplierinfo,qty:0
-msgid "The minimal quantity to purchase for this supplier, expressed in the default unit of measure."
+msgid ""
+"The minimal quantity to purchase for this supplier, expressed in the default "
+"unit of measure."
 msgstr ""
 
 #. module: product
@@ -67,12 +75,17 @@ msgstr ""
 
 #. module: product
 #: help:product.product,incoming_qty:0
-msgid "Quantities of products that are planned to arrive in selected locations or all internal if none have been selected."
+msgid ""
+"Quantities of products that are planned to arrive in selected locations or "
+"all internal if none have been selected."
 msgstr ""
 
 #. module: product
 #: help:product.product,virtual_available:0
-msgid "Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming."
+msgid ""
+"Futur stock for this product according to the selected location or all "
+"internal if none have been selected. Computed as: Real Stock - Outgoing + "
+"Incoming."
 msgstr ""
 
 #. module: product
@@ -82,7 +95,9 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
-msgid "Set a template if this rule only apply to a template of product. Keep empty for all products"
+msgid ""
+"Set a template if this rule only apply to a template of product. Keep empty "
+"for all products"
 msgstr ""
 
 #. module: product
@@ -173,7 +188,9 @@ msgstr ""
 
 #. module: product
 #: help:product.template,list_price:0
-msgid "Base price for computing the customer price. Sometimes called the catalog price."
+msgid ""
+"Base price for computing the customer price. Sometimes called the catalog "
+"price."
 msgstr ""
 
 #. module: product
@@ -199,7 +216,7 @@ msgstr ""
 #. module: product
 #: field:product.product,incoming_qty:0
 msgid "Incoming"
-msgstr ""
+msgstr "Binnenkomend"
 
 #. module: product
 #: selection:product.template,procure_method:0
@@ -219,7 +236,9 @@ msgstr ""
 
 #. module: product
 #: help:product.template,supply_method:0
-msgid "Produce will generate production order or tasks, according to the product type. Purchase will trigger purchase orders when requested."
+msgid ""
+"Produce will generate production order or tasks, according to the product "
+"type. Purchase will trigger purchase orders when requested."
 msgstr ""
 
 #. module: product
@@ -254,7 +273,8 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
-msgid "Sets the price so that it is a multiple of this value.\n"
+msgid ""
+"Sets the price so that it is a multiple of this value.\n"
 "Rounding is applied after the discount and before the surcharge.\n"
 "To have prices that end in 9.99, set rounding 10, surcharge -0.01"
 msgstr ""
@@ -282,7 +302,9 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.item,product_id:0
-msgid "Set a product if this rule only apply to one product. Keep empty for all products"
+msgid ""
+"Set a product if this rule only apply to one product. Keep empty for all "
+"products"
 msgstr ""
 
 #. module: product
@@ -371,7 +393,10 @@ msgstr ""
 
 #. module: product
 #: help:product.template,cost_method:0
-msgid "Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."
+msgid ""
+"Standard Price: the cost price is fixed and recomputed periodically (usually "
+"at the end of the year), Average Price: the cost price is recomputed at each "
+"reception of products."
 msgstr ""
 
 #. module: product
@@ -524,7 +549,10 @@ msgstr ""
 
 #. module: product
 #: help:product.template,seller_delay:0
-msgid "This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."
+msgid ""
+"This is the average delay in days between the purchase order confirmation "
+"and the reception of goods for this product and for the default supplier. It "
+"is used by the scheduler to order requests based on reordering delays."
 msgstr ""
 
 #. module: product
@@ -554,7 +582,9 @@ msgstr ""
 
 #. module: product
 #: help:res.partner,property_product_pricelist:0
-msgid "This pricelist will be used, instead of the default one,                     for sales to the current partner"
+msgid ""
+"This pricelist will be used, instead of the default one,                     "
+"for sales to the current partner"
 msgstr ""
 
 #. module: product
@@ -590,7 +620,9 @@ msgstr ""
 
 #. module: product
 #: help:product.template,sale_ok:0
-msgid "Determine if the product can be visible in the list of product within a selection from a sale order line."
+msgid ""
+"Determine if the product can be visible in the list of product within a "
+"selection from a sale order line."
 msgstr ""
 
 #. module: product
@@ -610,12 +642,16 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.type,key:0
-msgid "Used in the code to select specific prices based on the context. Keep unchanged."
+msgid ""
+"Used in the code to select specific prices based on the context. Keep "
+"unchanged."
 msgstr ""
 
 #. module: product
 #: help:product.product,outgoing_qty:0
-msgid "Quantities of products that are planned to leave in selected locations or all internal if none have been selected."
+msgid ""
+"Quantities of products that are planned to leave in selected locations or "
+"all internal if none have been selected."
 msgstr ""
 
 #. module: product
@@ -625,7 +661,10 @@ msgstr ""
 
 #. module: product
 #: help:product.template,procure_method:0
-msgid "'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."
+msgid ""
+"'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."
 msgstr ""
 
 #. module: product
@@ -647,7 +686,10 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.version,active:0
-msgid "When a version is duplicated it is set to non active, so that the dates do not overlaps with original version. You should change the dates and reactivate the pricelist"
+msgid ""
+"When a version is duplicated it is set to non active, so that the dates do "
+"not overlaps with original version. You should change the dates and "
+"reactivate the pricelist"
 msgstr ""
 
 #. module: product
@@ -714,7 +756,9 @@ msgstr ""
 
 #. module: product
 #: help:product.supplierinfo,product_name:0
-msgid "Name of the product for this partner, will be used when printing a request for quotation. Keep empty to use the internal one."
+msgid ""
+"Name of the product for this partner, will be used when printing a request "
+"for quotation. Keep empty to use the internal one."
 msgstr ""
 
 #. module: product
@@ -788,7 +832,9 @@ msgstr ""
 
 #. module: product
 #: help:product.product,qty_available:0
-msgid "Current quantities of products in selected locations or all internal if none have been selected."
+msgid ""
+"Current quantities of products in selected locations or all internal if none "
+"have been selected."
 msgstr ""
 
 #. module: product
@@ -808,7 +854,8 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.item,min_quantity:0
-msgid "The rule only applies if the partner buys/sells more than this quantity."
+msgid ""
+"The rule only applies if the partner buys/sells more than this quantity."
 msgstr ""
 
 #. module: product
@@ -828,7 +875,9 @@ msgstr ""
 
 #. module: product
 #: help:product.uom,category_id:0
-msgid "Unit of Measure of a category can be converted between each others in the same category."
+msgid ""
+"Unit of Measure of a category can be converted between each others in the "
+"same category."
 msgstr ""
 
 #. module: product
@@ -848,7 +897,8 @@ msgstr ""
 
 #. module: product
 #: constraint:product.template:0
-msgid "Error: The default UOM and the purchase UOM must be in the same category."
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
 
 #. module: product
@@ -883,7 +933,10 @@ msgstr ""
 
 #. module: product
 #: help:product.template,uos_id:0
-msgid "Used by companies that manages two unit of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM."
+msgid ""
+"Used by companies that manages two unit of measure: invoicing and inventory "
+"management. For example, in food industries, you will manage a stock of ham "
+"but invoice in Kg. Keep empty to use the default UOM."
 msgstr ""
 
 #. module: product
@@ -1062,7 +1115,9 @@ msgstr ""
 
 #. module: product
 #: help:product.product,packaging:0
-msgid "Gives the different ways to package the same product. This has no impact on the packing order and is mainly used if you use the EDI module."
+msgid ""
+"Gives the different ways to package the same product. This has no impact on "
+"the packing order and is mainly used if you use the EDI module."
 msgstr ""
 
 #. module: product
@@ -1106,7 +1161,8 @@ msgstr ""
 
 #. module: product
 #: help:product.uom,factor_inv:0
-msgid "The coefficient for the formula:\n"
+msgid ""
+"The coefficient for the formula:\n"
 "coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
 msgstr ""
 
@@ -1145,7 +1201,9 @@ msgstr ""
 
 #. module: product
 #: help:product.uom,rounding:0
-msgid "The computed quantity will be a multiple of this value. Use 1.0 for products that can not be split."
+msgid ""
+"The computed quantity will be a multiple of this value. Use 1.0 for products "
+"that can not be split."
 msgstr ""
 
 #. module: product
@@ -1246,8 +1304,10 @@ msgstr ""
 
 #. module: product
 #: 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 !"
+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: product
 #: wizard_field:product.price_list,init,qty4:0
@@ -1278,7 +1338,9 @@ msgstr ""
 
 #. module: product
 #: help:product.supplierinfo,product_code:0
-msgid "Code of the product for this partner, will be used when printing a request for quotation. Keep empty to use the internal one."
+msgid ""
+"Code of the product for this partner, will be used when printing a request "
+"for quotation. Keep empty to use the internal one."
 msgstr ""
 
 #. module: product
@@ -1308,7 +1370,10 @@ msgstr ""
 
 #. module: product
 #: help:product.template,type:0
-msgid "Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."
+msgid ""
+"Will change the way procurements are processed. Consumables are stockable "
+"products with infinite stock, or for use when you have no inventory "
+"management in the system."
 msgstr ""
 
 #. module: product
@@ -1364,7 +1429,10 @@ msgstr ""
 
 #. module: product
 #: help:product.template,sale_delay:0
-msgid "This is the average time between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."
+msgid ""
+"This is the average time between the confirmation of the customer order and "
+"the delivery of the finished products. It's the time you promise to your "
+"customers."
 msgstr ""
 
 #. module: product
@@ -1457,7 +1525,8 @@ msgstr ""
 
 #. module: product
 #: help:product.template,uos_coeff:0
-msgid "Coefficient to convert UOM to UOS\n"
+msgid ""
+"Coefficient to convert UOM to UOS\n"
 " uom = uos * coeff"
 msgstr ""
 
@@ -1515,7 +1584,8 @@ msgstr ""
 
 #. module: product
 #: help:product.uom,factor:0
-msgid "The coefficient for the formula:\n"
+msgid ""
+"The coefficient for the formula:\n"
 "1 (base unit) = coeff (this unit). Rate = 1 / Factor."
 msgstr ""
 
@@ -1553,7 +1623,11 @@ msgstr ""
 
 #. module: product
 #: help:product.template,produce_delay:0
-msgid "Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different delays will be summed for all levels and purchase orders."
+msgid ""
+"Average time to produce this product. This is only for the production order "
+"and, if it is a multi-level bill of material, it's only for the level of "
+"this product. Different delays will be summed for all levels and purchase "
+"orders."
 msgstr ""
 
 #. module: product
@@ -1573,12 +1647,17 @@ msgstr ""
 
 #. module: product
 #: help:product.supplierinfo,delay:0
-msgid "Delay in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."
+msgid ""
+"Delay in days between the confirmation of the purchase order and the "
+"reception of the products in your warehouse. Used by the scheduler for "
+"automatic computation of the purchase order planning."
 msgstr ""
 
 #. module: product
 #: help:product.template,uom_po_id:0
-msgid "Default Unit of Measure used for purchase orders. It must in the same category than the default unit of measure."
+msgid ""
+"Default Unit of Measure used for purchase orders. It must in the same "
+"category than the default unit of measure."
 msgstr ""
 
 #. module: product
@@ -1593,7 +1672,9 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
-msgid "Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"
+msgid ""
+"Set a category of product if this rule only apply to products of a category "
+"and his childs. Keep empty for all products"
 msgstr ""
 
 #. module: product
@@ -1620,4 +1701,3 @@ msgstr ""
 #: field:product.pricelist.item,price_discount:0
 msgid "Price Discount"
 msgstr ""
-
diff --git a/addons/product/product.py b/addons/product/product.py
index aa916fb5b5c..8029f8309d3 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -48,25 +48,24 @@ class product_uom(osv.osv):
     _name = 'product.uom'
     _description = 'Product Unit of Measure'
 
+    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):
         res = {}
         for uom in self.browse(cursor, user, ids, context=context):
-            if uom.factor:
-                res[uom.id] = round(1 / uom.factor, 6)
-            else:
-                res[uom.id] = 0.0
+            res[uom.id] = self._compute_factor_inv(uom.factor)
         return res
 
     def _factor_inv_write(self, cursor, user, id, name, value, arg, context):
-        if value:
-            self.write(cursor, user, id, {
-                'factor': round(1/value, 6),
-            }, context=context)
-        else:
-            self.write(cursor, user, id, {
-                'factor': 0.0,
-            }, context=context)
-        return True
+        return self.write(cursor, user, id, {'factor': self._compute_factor_inv(value)}, context=context)
+
+    def create(self, cr, uid, data, context={}):
+        if 'factor_inv' in data:
+            if data['factor_inv'] <> 1:
+                data['factor'] = self._compute_factor_inv(data['factor_inv'])
+            del(data['factor_inv'])
+        return super(product_uom, self).create(cr, uid, data, context)
 
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
@@ -85,13 +84,11 @@ class product_uom(osv.osv):
                  "Use 1.0 for a UoM that cannot be further split, such as a piece."),
         'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."),
         'uom_type': fields.selection([('bigger','Bigger than the reference UoM'),
-                                      ('reference','Reference UoM for this category (ratio=1)'),
+                                      ('reference','Reference UoM for this category'),
                                       ('smaller','Smaller than the reference UoM')],'UoM Type', required=1),
     }
 
     _defaults = {
-        'factor': 1.0,
-        'factor_inv': 1.0,
         'active': 1,
         'rounding': 0.01,
         'uom_type': 'reference',
@@ -183,7 +180,7 @@ class product_category(osv.osv):
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
         'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type'),
     }
-    
+
 
     _defaults = {
         'type' : lambda *a : 'normal',
@@ -215,14 +212,18 @@ product_category()
 class product_template(osv.osv):
     _name = "product.template"
     _description = "Product Template"
-    def _calc_seller_delay(self, cr, uid, ids, name, arg, context={}):
+    def _calc_seller(self, cr, uid, ids, fields, arg, context={}):
         result = {}
         for product in self.browse(cr, uid, ids, context):
+            for field in fields:
+                result[product.id] = {field:False}
+            result[product.id]['seller_delay'] = 1
             if product.seller_ids:
                 partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  product.seller_ids if partner_id and partner_id.sequence])
-                result[product.id] = partner_list and partner_list[0] and partner_list[0][1] and partner_list[0][1].delay or False
-            else:
-                result[product.id] = 1
+                main_supplier = partner_list and partner_list[0] and partner_list[0][1] or False
+                result[product.id]['seller_delay'] =  main_supplier and main_supplier.delay or 1
+                result[product.id]['seller_qty'] =  main_supplier and main_supplier.qty or 0.0
+                result[product.id]['seller_id'] = main_supplier and main_supplier.name.id or False
         return result
 
     _columns = {
@@ -233,8 +234,8 @@ class product_template(osv.osv):
         'description_sale': fields.text('Sale Description',translate=True),
         'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."),
         'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Purchase will trigger purchase orders when requested."),
-        'sale_delay': fields.float('Customer Lead Time', help="This is the average time between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
-        'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
+        'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
+        'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement 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."),
         'rental': fields.boolean('Can be Rent'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
@@ -257,7 +258,9 @@ class product_template(osv.osv):
             help='Coefficient to convert UOM to UOS\n'
             ' uos = uom * coeff'),
         'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
-        'seller_delay': fields.function(_calc_seller_delay, method=True, type='integer', string='Supplier Lead Time', help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
+        'seller_delay': fields.function(_calc_seller, method=True, type='integer', string='Supplier Lead Time', multi="seller_delay", help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
+        'seller_qty': fields.function(_calc_seller, method=True, type='float', string='Supplier Quantity', multi="seller_qty", help="This is minimum quantity to purchase from Main Supplier."),
+        'seller_id': fields.function(_calc_seller, method=True, type='many2one', relation="res.partner", string='Main Supplier', help="Main Supplier who has highest priority in Supplier List.", multi="seller_id"),
         'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
         'loc_rack': fields.char('Rack', size=16),
         'loc_row': fields.char('Row', size=16),
@@ -619,12 +622,32 @@ 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={}):
+        result = {}
+        product_uom_pool = self.pool.get('product.uom')
+        for supplier_info in self.browse(cr, uid, ids, context):
+            for field in fields:
+                result[supplier_info.id] = {field:False}
+            if supplier_info.product_uom.id:
+                qty = product_uom_pool._compute_qty(cr, uid, supplier_info.product_uom.id, supplier_info.min_qty, to_uom_id=supplier_info.product_id.uom_id.id)
+            else:
+                qty = supplier_info.min_qty
+            result[supplier_info.id]['qty'] = qty
+        return result
+
+    def _get_uom_id(self, cr, uid, *args):
+        cr.execute('select id from product_uom order by id limit 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+
     _columns = {
         'name' : fields.many2one('res.partner', 'Supplier', required=True, ondelete='cascade', help="Supplier of this product"),
         'product_name': fields.char('Supplier Product Name', size=128, help="This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
         'product_code': fields.char('Supplier Product Code', size=64, help="This supplier's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
         'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
-        'qty' : fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the default unit of measure."),
+        'product_uom': fields.many2one('product.uom', string="UOM", help="Supplier Product UoM."),
+        'min_qty': fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the default unit of measure."),
+        'qty': fields.function(_calc_qty, method=True, store=True, type='float', string='Quantity', multi="qty", help="This is a quantity which is converted into Default Uom."),
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
         'delay' : fields.integer('Delivery Lead Time', required=True, help="Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."),
         'pricelist_ids': fields.one2many('pricelist.partnerinfo', 'suppinfo_id', 'Supplier Pricelist'),
@@ -636,6 +659,55 @@ 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):
+            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
+
+    _constraints = [
+        (_check_uom, 'Error: The default UOM and the Supplier Product UOM must be in the same category.', ['product_uom']),
+    ]
+    def price_get(self, cr, uid, supplier_ids, product_id, product_qty=1, context=None):
+        """
+        Calculate price from supplier pricelist.
+        @param supplier_ids: Ids of res.partner object.
+        @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 = {}
+        product_pool = self.pool.get('product.product')
+        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
+        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]
+
+            # Compute price from Purchase pricelist of supplier
+            pricelist_id = supplier.property_product_pricelist_purchase.id
+            if pricelist_id:
+                price = pricelist_pool.price_get(cr, uid, [pricelist_id], product_id, product_qty).setdefault(pricelist_id, 0)
+                price = currency_pool.compute(cr, uid, pricelist_pool.browse(cr, uid, pricelist_id).currency_id.id, currency_id, price)
+
+            # Compute price from supplier pricelist which are in Supplier Information
+            supplier_info_ids = self.search(cr, uid, [('name','=',supplier.id),('product_id','=',product_id)])
+            if supplier_info_ids:
+                cr.execute('SELECT * ' \
+                    'FROM pricelist_partnerinfo ' \
+                    'WHERE suppinfo_id IN %s' \
+                    'AND min_quantity <= %s ' \
+                    'ORDER BY min_quantity DESC LIMIT 1', (tuple(supplier_info_ids),product_qty,))
+                res2 = cr.dictfetchone()
+                if res2:
+                    price = res2['price']
+            res[supplier.id] = price
+        return res
     _order = 'sequence'
 product_supplierinfo()
 
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index a2405f33b52..1dd0bca9d00 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -356,114 +356,133 @@
         <record id="supplierinfo1" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_asus"/>
             <field name="qty">10</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_mb1"/>
             <field name="delay">5</field>
         </record>
         <record id="supplierinfo2" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_asus"/>
             <field name="qty">10</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_mb2"/>
             <field name="delay">5</field>
         </record>
         <record id="supplierinfo3" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_mb1"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo4" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_mb2"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo5" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_pc1"/>
             <field name="delay">2</field>
         </record>
         <record id="supplierinfo6" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_pc2"/>
             <field name="delay">2</field>
         </record>
         <record id="supplierinfo7" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_pc3"/>
             <field name="delay">2</field>
         </record>
         <record id="supplierinfo8" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_pc4"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo9" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_cpu1"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo10" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_cpu3"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo11" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_hdd1"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo12" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_hdd2"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo13" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_hdd3"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo14" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_20"/>
             <field name="delay">10</field>
         </record>
         <record id="supplierinfo15" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_21"/>
             <field name="delay">10</field>
         </record>
         <record id="supplierinfo16" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_22"/>
             <field name="delay">10</field>
         </record>
         <record id="supplierinfo17" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_seagate"/>
             <field name="qty">10</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_hdd1"/>
             <field name="delay">10</field>
         </record>
         <record id="supplierinfo18" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_seagate"/>
             <field name="qty">10</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_hdd2"/>
             <field name="delay">10</field>
         </record>
         <record id="supplierinfo19" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">10</field>
+            <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_hdd3"/>
             <field name="delay">10</field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e58987cf2c8..bd3becd3cdd 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -27,7 +27,7 @@
                        <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
                    <newline/>
-                   <group expand="0" string="Extended options..." groups="base.group_extended">
+                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
                        <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
                    </group>
                 </search>
@@ -149,6 +149,8 @@
                             <newline/>
                             <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
+                            <field groups="base.group_extended" name="seller_id"/>
+                            <newline/>  
                             <field colspan="4" name="seller_ids" nolabel="1"/>
                         </page>
                         <page string="Descriptions">
@@ -192,6 +194,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_product_tree_view"/>
             <field name="search_view_id" ref="product_search_form_view"/>
+            <field name="help">In OpenERP, a product is something you can buy and sell. It can be a raw material, a stockable product, a consumable or a service. The product form contains a detailed information on the products like procurement logistic, sales price, product category, suppliers, etc.</field>
         </record>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
@@ -250,6 +253,7 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="product_category_tree_view"/>
+            <field name="help">Products category opens a tree structure view of your products by category.</field>
         </record>
         <menuitem
             action="product_category_action"
@@ -297,6 +301,7 @@
                 <tree string="Units of Measure">
                     <field name="name"/>
                     <field name="category_id"/>
+                    <field name="uom_type"/>
                     <field name="factor"/>
                     <field name="rounding"/>
                 </tree>
@@ -450,8 +455,10 @@
                     <field name="sequence"/>
                     <field name="product_name" groups="base.group_extended"/>
                     <field name="product_code" groups="base.group_extended"/>
-                    <field name="delay"/>
+                    <field name="min_qty"/>
+                    <field name="product_uom" widget="selection"/>
                     <field name="qty"/>
+                    <field name="delay"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field colspan="4" groups="base.group_extended" name="pricelist_ids" nolabel="1" widget="one2many_list">
                         <tree editable="bottom" string="Pricelist">
@@ -487,7 +494,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Variant">
-                     <field name="product_tmpl_id" select="1"/>                
+                     <field name="product_tmpl_id" select="1"/>
                     <field name="active" select="1"/>
                     <field name="variants" select="1"/>
                     <field name="default_code" select="1"/>
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 328d8d5707f..76bf07ad96a 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -23,7 +23,7 @@ import time
 from report import report_sxw
 from osv import osv
 import pooler
-
+from tools.translate import _
 class product_pricelist(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(product_pricelist, self).__init__(cr, uid, name, context=context)
diff --git a/addons/product/wizard/product_price.py b/addons/product/wizard/product_price.py
index e5d73945c13..efca2fb6cc1 100644
--- a/addons/product/wizard/product_price.py
+++ b/addons/product/wizard/product_price.py
@@ -44,18 +44,14 @@ class product_price_list(osv.osv_memory):
     }
 
     def print_report(self, cr, uid, ids, context=None):
-
         """
-              To get the date and print the report
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary
-             @return : return report
+        To get the date and print the report
+        @return : return report
         """
         datas = {'ids': context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['price_list','qty1', 'qty2','qty3','qty4','qty5'], context)
         res = res and res[0] or {}
+        price_dict = self.pool.get('product.pricelist').price_get(cr, uid, [res['price_list']], 1, 1.0)
         datas['form'] = res
         return {
             'type': 'ir.actions.report.xml',
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index a253a0e00af..bd5b06e30a1 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -5,11 +5,12 @@
     <!--   Product Price List -->
 
 		<record id="view_product_price_list" model="ir.ui.view">
-		      <field name="name">Price List</field>
+		      <field name="name">Price per unit</field>
 		      <field name="model">product.price_list</field>
 		      <field name="type">form</field>
 		      <field name="arch" type="xml">
-				<form string="Price list">
+				<form string="Price per Unit">
+                    <separator colspan="4" string="Calculate Product Price per unit base on pricelist version."/>
 				    <field name="price_list" widget="selection"/>
 				    <field name="qty1" colspan="2" />
 				    <field name="qty2" colspan="2" />
@@ -19,15 +20,17 @@
 					<separator colspan="4"/>
                     <group col="2" colspan="4">
                          <button icon="gtk-cancel" special="cancel" string="Close"/>
-                         <button name="print_report" string="Print Report"  type="object"  icon="gtk-print"/>
+                         <button name="print_report" string="Print"  type="object"  icon="gtk-print"/>
                     </group>
 				</form>
 		      </field>
     	</record>
 
         <act_window id="action_product_price_list"
-    		key2="client_action_multi" name="Price List"
-    		res_model="product.price_list" src_model="product.product"
+    		key2="client_print_multi" 
+            name="Price Per Unit"
+    		res_model="product.price_list" 
+            src_model="product.product"
     		view_mode="form" target="new" view_type="form" />
 
 </data>
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index b03777ecec6..fc682986aae 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -22,7 +22,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "category" : "Enterprise Specific Modules/Food Industries",
-    "depends" : ["base", "account", "product", "stock"],
+    "depends" : ["stock"],
     "init_xml" : [],
     "demo_xml" : ["product_expiry_demo.xml"],
     "description": '''Track different dates on products and production lots:
diff --git a/addons/product_expiry/i18n/sl.po b/addons/product_expiry/i18n/sl.po
new file mode 100644
index 00000000000..bca1d702534
--- /dev/null
+++ b/addons/product_expiry/i18n/sl.po
@@ -0,0 +1,161 @@
+# 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: 2009-06-30 15:09+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-07-29 03:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_expiry
+#: field:product.product,life_time:0
+msgid "Product lifetime"
+msgstr ""
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_from_product_template
+msgid "Ham"
+msgstr "Šunka"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_lait_product_template
+msgid "Cow milk"
+msgstr "Kravje mleko"
+
+#. module: product_expiry
+#: model:ir.module.module,shortdesc:product_expiry.module_meta_information
+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
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid "The date the lot may become dangerous and should not be consumed."
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,removal_date:0
+msgid "Removal Date"
+msgstr ""
+
+#. module: product_expiry
+#: model:ir.module.module,description:product_expiry.module_meta_information
+msgid ""
+"Track different dates on products and production lots:\n"
+" - end of life\n"
+" - best before date\n"
+" - removal date\n"
+" - alert date\n"
+"Used, for example, in food industries."
+msgstr ""
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_pain_product_template
+msgid "Bread"
+msgstr "Kruh"
+
+#. module: product_expiry
+#: model:product.uom,name:product_expiry.product_uom_ltr
+#: model:product.uom.categ,name:product_expiry.product_uom_categ_vol
+msgid "LTR"
+msgstr ""
+
+#. module: product_expiry
+#: view:product.product:0
+#: view:stock.production.lot:0
+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
+#: field:stock.production.lot,life_date:0
+msgid "End of Life Date"
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,use_date:0
+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"
+msgstr ""
+
+#. module: product_expiry
+#: help:product.product,removal_time:0
+msgid "The number of days before a production lot should be removed."
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,use_time:0
+msgid "Product usetime"
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,removal_time:0
+msgid "Product removal time"
+msgstr ""
+
+#. module: product_expiry
+#: help:product.product,use_time:0
+msgid ""
+"The number of days before a production lot starts deteriorating without "
+"becoming dangerous."
+msgstr ""
+
+#. module: product_expiry
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Napaka: neveljavna EAN črtna koda"
+
+#. module: product_expiry
+#: help:product.product,life_time:0
+msgid ""
+"The number of days before a production lot may become dangerous and should "
+"not be consumed."
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date the lot should be removed."
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,alert_time:0
+msgid "Product alert time"
+msgstr ""
diff --git a/addons/product_expiry/product_expiry_demo.xml b/addons/product_expiry/product_expiry_demo.xml
index b5e8adc6b07..4ddeb92e359 100644
--- a/addons/product_expiry/product_expiry_demo.xml
+++ b/addons/product_expiry/product_expiry_demo.xml
@@ -7,6 +7,7 @@
 	<record id="product_uom_ltr" model="product.uom">
 		<field name="category_id" ref="product_uom_categ_vol"/>
 		<field name="name">LTR</field>
+		<field name="factor">1.0</field>
 	</record>
 	
 		<record id="product_product_jambon" model="product.product">
@@ -26,7 +27,7 @@
 			<field name="ean13">3307630302014</field>
 			<field name="categ_id" search="[]" model="product.category"/>
 		</record>
-		<record model="product.packaging">
+		<record id="product_package_jambon" model="product.packaging">
 			<field name="name">box of 10</field>
 			<field name="qty">12</field>
 			<field name="ul" ref="product.product_ul_box" />
@@ -55,7 +56,7 @@
 			<field name="ean13">3307631101876</field>
 			<field name="categ_id" search="[]" model="product.category"/>
 		</record>
-		<record model="product.packaging">
+		<record id="product_package_from" model="product.packaging">
 			<field name="name">Box of 5</field>
 			<field name="qty">12</field>
 			<field name="ul" ref="product.product_ul_box" />
@@ -84,7 +85,7 @@
 			<field name="ean13">3307631102323</field>
 			<field name="categ_id" search="[]" model="product.category"/>
 		</record>
-		<record model="product.packaging">
+		<record id="product_package_pain" model="product.packaging">
 			<field name="name">Bag of 2</field>
 			<field name="qty">6</field>
 			<field name="ul" ref="product.product_ul_box" />
@@ -113,7 +114,7 @@
 			<field name="ean13">3307630302045</field>
 			<field name="categ_id" search="[]" model="product.category"/>
 		</record>
-		<record model="product.packaging">
+		<record id="product_package_lait" model="product.packaging">
 			<field name="name">Boxes of 1 liter</field>
 			<field name="qty">4</field>
 			<field name="ul" ref="product.product_ul_box" />
diff --git a/addons/product_manufacturer/i18n/et.po b/addons/product_manufacturer/i18n/et.po
index 9213df55e2b..3ec28061a9a 100644
--- a/addons/product_manufacturer/i18n/et.po
+++ b/addons/product_manufacturer/i18n/et.po
@@ -8,99 +8,99 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-25 13:27+0000\n"
-"PO-Revision-Date: 2010-06-25 18:10+0000\n"
+"PO-Revision-Date: 2010-07-30 09:04+0000\n"
 "Last-Translator: lyyser <logard.1961@gmail.com>\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-06-26 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-07-31 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: product_electronic
-#: model:ir.module.module,description:product_electronic.module_meta_information
+#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
 msgid "A module that add manufacturers and attributes on the product form"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
 msgid "Manufacturer product code"
 msgstr "Tootja tootekood"
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Vigane XML vaate arhitektuurile!"
 
-#. module: product_electronic
-#: view:product.electronic.attribute:0
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr "Toote Malli nimi"
 
-#. module: product_electronic
+#. 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_electronic
-#: model:ir.model,name:product_electronic.model_product_electronic_attribute
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_electronic_attribute
 msgid "Product attributes"
 msgstr "Toote omadused"
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 msgid "Manufacturing data"
 msgstr "Tootmise andmed"
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 msgid "Product reference"
 msgstr "Toote viide"
 
-#. module: product_electronic
-#: field:product.electronic.attribute,name:0
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
 msgid "Attribute"
 msgstr "Atribuut"
 
-#. module: product_electronic
-#: field:product.electronic.attribute,product_id:0
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,product_id:0
 msgid "Product"
 msgstr "Toode"
 
-#. module: product_electronic
-#: field:product.electronic.attribute,value:0
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "Väärtus"
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 msgid "Manufacturing Data"
 msgstr "Valmistusandmeid"
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 msgid "Product name"
 msgstr "Toote nimi"
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
 msgid "Attributes"
 msgstr "Omadused"
 
-#. module: product_electronic
-#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
 msgid "Products Attributes & Manufacturers"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: field:product.product,manufacturer_pname:0
 msgid "Manufacturer product name"
 msgstr "Toote nimetus"
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
-msgstr "Tootja"
+msgstr "Valmistaja"
diff --git a/addons/product_manufacturer/i18n/fr.po b/addons/product_manufacturer/i18n/fr.po
new file mode 100644
index 00000000000..20ab19206f6
--- /dev/null
+++ b/addons/product_manufacturer/i18n/fr.po
@@ -0,0 +1,105 @@
+# 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: 2009-11-25 13:27+0000\n"
+"PO-Revision-Date: 2010-07-22 09:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-07-23 04:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_electronic
+#: model:ir.module.module,description:product_electronic.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer product code"
+msgstr ""
+
+#. module: product_electronic
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.electronic.attribute:0
+msgid "Product Template Name"
+msgstr ""
+
+#. module: product_electronic
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: product_electronic
+#: model:ir.model,name:product_electronic.model_product_electronic_attribute
+msgid "Product attributes"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Manufacturing data"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Product reference"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.electronic.attribute,name:0
+msgid "Attribute"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.electronic.attribute,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.electronic.attribute,value:0
+msgid "Value"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Manufacturing Data"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Product name"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr ""
+
+#. module: product_electronic
+#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer product name"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr ""
diff --git a/addons/product_manufacturer/i18n/sl.po b/addons/product_manufacturer/i18n/sl.po
new file mode 100644
index 00000000000..7b374fb4fc8
--- /dev/null
+++ b/addons/product_manufacturer/i18n/sl.po
@@ -0,0 +1,106 @@
+# 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: 2009-11-25 13:27+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-07-29 03:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_electronic
+#: model:ir.module.module,description:product_electronic.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer product code"
+msgstr ""
+
+#. module: product_electronic
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: product_electronic
+#: view:product.electronic.attribute:0
+msgid "Product Template Name"
+msgstr ""
+
+#. module: product_electronic
+#: 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_electronic
+#: model:ir.model,name:product_electronic.model_product_electronic_attribute
+msgid "Product attributes"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Manufacturing data"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Product reference"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.electronic.attribute,name:0
+msgid "Attribute"
+msgstr "Lastnost"
+
+#. module: product_electronic
+#: field:product.electronic.attribute,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: product_electronic
+#: field:product.electronic.attribute,value:0
+msgid "Value"
+msgstr "Vrednost"
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Manufacturing Data"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Product name"
+msgstr "Ime proizvoda"
+
+#. module: product_electronic
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "Lastnosti"
+
+#. module: product_electronic
+#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer product name"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "Proizvajalec"
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index e80f14ae490..495c3a76b53 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -29,7 +29,7 @@ Adds a reporting menu in products that computes sales, purchases, margins
 and other interesting indicators based on invoices. The wizard to launch
 the report has several options to help you get the data you need.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base', 'product', 'account'],
     'update_xml': [
                    'security/ir.model.access.csv',
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index ae977e633ff..f767ea3526e 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -20,7 +20,7 @@
 {
     "name": "Visible Discount",
     "version": "1.0",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "category": "Generic Modules/Sales & Purchases",
     "description": """
     This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
diff --git a/addons/product_visible_discount/i18n/pl.po b/addons/product_visible_discount/i18n/pl.po
new file mode 100644
index 00000000000..d26d4e09b6b
--- /dev/null
+++ b/addons/product_visible_discount/i18n/pl.po
@@ -0,0 +1,59 @@
+# Polish 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: 2009-03-25 12:11+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-07-27 03:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. 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
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+"    This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"    To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+"    Example:\n"
+"        For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+"        If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+"        If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+"    "
+msgstr ""
+"\n"
+"    Ten moduł pozwala obliczać upusty przy pozycjach zamówień sprzedaży i "
+"pozycjach faktur bazując na cenniku partnera.\n"
+"    Nowa opcja \"Widoczny upust\" jest dodana do formularza cennika.\n"
+"    Przykład:\n"
+"        Dla produktu PC1 i partnera \"Asustek\": jeśli cena cennikowa=450 i "
+"cena wg cennika dla Asustek jest 225\n"
+"        Jeśli opcja jest włączona, to w pozycji zamówienia będzie: Cena "
+"jedn.=450, Upust=50,00, Cena netto=225\n"
+"        Jeśli opcja jest wyłączona, to w pozycji zamówienia będzie: Unit "
+"jedn.=225, Upust=0,00, Cena netto=225\n"
+"    "
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Widoczny upust"
diff --git a/addons/profile_accounting/__openerp__.py b/addons/profile_accounting/__openerp__.py
index 9e02bd3e275..b438db8e7b2 100644
--- a/addons/profile_accounting/__openerp__.py
+++ b/addons/profile_accounting/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Profile',
     'description': """Profile for Accounting""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['account', 'board_account', 'account_followup'],
     'update_xml': ['security/ir.model.access.csv', 'profile_accounting.xml'],
     'demo_xml': [],
diff --git a/addons/profile_manufacturing/i18n/ar.po b/addons/profile_manufacturing/i18n/ar.po
deleted file mode 100644
index e0a7975fa4b..00000000000
--- a/addons/profile_manufacturing/i18n/ar.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/bg.po b/addons/profile_manufacturing/i18n/bg.po
deleted file mode 100644
index 2f0335cae0f..00000000000
--- a/addons/profile_manufacturing/i18n/bg.po
+++ /dev/null
@@ -1,231 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-02-03 12:07+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/bs.po b/addons/profile_manufacturing/i18n/bs.po
deleted file mode 100644
index 38a66b0d9ac..00000000000
--- a/addons/profile_manufacturing/i18n/bs.po
+++ /dev/null
@@ -1,230 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-11-17 10:58+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Upravljanje Odnosima"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "Profil Proizvodnje: Instaliraj Dodatne Module"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Upravljanje Dokumentacijom"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Portal"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "Zaliha i Proizvodnja"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instaliraj"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "CRM i Kalendari"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Popravi"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Upravljanje Prodajom"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Upozorenje"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Poništi"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Svrha Prodaje"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "Napredne Lokacije"
diff --git a/addons/profile_manufacturing/i18n/ca.po b/addons/profile_manufacturing/i18n/ca.po
deleted file mode 100644
index 93ee8ce40d6..00000000000
--- a/addons/profile_manufacturing/i18n/ca.po
+++ /dev/null
@@ -1,265 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-11-17 10:58+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "Operacions de fabricació"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr "Perfil per indústries manufactureres (fabricació)"
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "Planificació just a temps (JIT)"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr "Gestiona per diaris"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Gestió relacions amb el client"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr "Aquests mòdul permet gestionar un sistema de portal web."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"El sistema de gestió de documentació d'OpenERP us permet emmagatzemar, "
-"navegar, classificar automàticament, buscar i visualitzar tot tipus de "
-"documents (documents interns, informes impresos, sistema de calendari). Obre "
-"un accés de FTP per a que els usuaris naveguin fàcilment pels documents "
-"associats."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-"Aquest mòdul us permet gestionar les vostres vendes, facturació i enviaments "
-"per diaris. Podeu definir diaris per a camions, comercials, departaments, "
-"data de facturació, període de enviament, etc."
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "Perfil de fabricació: Instal·lar mòduls extres"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-"El mòdul JIT us permet no haver de executar el planificador periòdicament. "
-"És més fàcil i més ràpid per calcular l'estoc en temps real però, pel "
-"contrari, gestiona menys eficaçment prioritats en proveïments."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-"Aquest mòdul us permet, no només gestionar per ordre de producció, si no "
-"també per comanda/operació de treball. Serà capaç de planificar, analitzar "
-"el cost, verificar temps, ... en totes les operacions de cada ordre de "
-"fabricació"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestió de documents"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Portal"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "Estoc & Fabricació"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-"Permet gestionar reparacions de producte. Té en compte la data límit de "
-"garantia i la facturació de productes i serveis."
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-"Instal·leu més mòduls. Es proposen uns quants mòduls relacionats amb el "
-"perfil de fabricació que heu seleccionat. Els podreu instal·lar a partir "
-"dels nostres requisits."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-"Aquest mòdul us permet afegir sub productes en llistes de materials (LdM) en "
-"la planificació de fabricació de recursos (MRP)."
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "Perfil indústria manufacturera"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr "perfil.fabricacio.config.assistent_instal_mòduls"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-"Això instal·la funcionalitats de relació amb el client com: Seguiment de "
-"iniciatives i oportunitats, calendari compartit, seguiment de treballs, "
-"seguiment d'incidències, etc."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instal·la"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "CRM i calendaris"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Repara"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr "Mostra marges en el formulari de comandes de venda."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-"Aquest mòdul us permet gestionar un sistema de punt de venda (TPV). Ofereix "
-"un formulari bàsic per a operacions de TPV. Hauríeu de provar també el "
-"nostre client punt de venda per a una ergonomia perfecta amb pantalles "
-"tàctils i perifèrics per a processar els pagaments."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "Sub productes en la fabricació (MRP)"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Gestió de vendes"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Avís"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "Marges en comandes de venda"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-"Permet gestionar una logística avançada amb ubicacions diferents. Podeu "
-"definir, per producte: ubicacions per defecte, rutes d'ubicacions per a "
-"diferents operacions, etc. Aquest mòdul s'utilitza sovint per a: "
-"localització de productes, gestió d'una cadena de fabricació, un control de "
-"qualitat per ubicació, producte que es lloga, etc."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Terminal Punt de Venda"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "Ubicacions avançades"
diff --git a/addons/profile_manufacturing/i18n/cs.po b/addons/profile_manufacturing/i18n/cs.po
deleted file mode 100644
index e0a7975fa4b..00000000000
--- a/addons/profile_manufacturing/i18n/cs.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/de.po b/addons/profile_manufacturing/i18n/de.po
deleted file mode 100644
index d5c0a27afd1..00000000000
--- a/addons/profile_manufacturing/i18n/de.po
+++ /dev/null
@@ -1,263 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-11-22 19:22+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "Fertigungsvorgänge"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr "Profil für Produktionsbetriebe"
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "Just in Time Terminierung"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr "Journale verwalten"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Relationship Management"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr "Dieses Modul erlaubt die Nutzung eines Portalsystems."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"Das Dokumentenmanagement erlaubt Ihnen das Speichern, Browsen, Indexieren, "
-"Suchen und die Ansicht aller Arten von Dokumente (interne Dokumente, Bilder, "
-"Reports, Kalender). Es erlaubt einen FTP Zugang für die Benutzer um einfach "
-"im Dokumentenpool zu surfen."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-"Dieses Modul erlaubt das Management von Aufträgen, Abrechnung, "
-"Warenbewegungen durch Journale. Sie können Journale definieren für "
-"Fahrzeuge, Verkäufer, Abteilungen, Rechnungsdatum, Auslieferungsperiode etc."
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "Produktion Profil: Installiere Extra Module"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-"Das JIT Modul erlaubt ihnen eine automatische Durchführung der automatischen "
-"Dispositionsläufe. Es ist schneller und einfacher als Lagerhaltung in "
-"Echtzeit erlaubt aber weniger Priritäten bei der Konfiguration der "
-"automatischen Beschaffung."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-"Dieses Modul erlaubt Ihnen die Steuerung nicht nur nach Fertigungsauftrag "
-"sondern auch nach Arbeitsauftrag / -vorgang. Sie sind dann in der Lage zu "
-"planen, Kosten zu analysieren, Zeiten zu prüfen, ... zu allen Teilvorgängen "
-"Ihrer Produktionsaufträge"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Dokumenten Management"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Portal"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "Lager & Fertigung"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-"Erlaubt Ihnen ein Management Ihrer Reparaturen. Handelt das Garantieende und "
-"die Berechnung von Produkten und Services."
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-"Installiert alle Module. Einige Module werden speziell zu Ihrem Profil "
-"vorgeschlagen. Sie können jederzeit gezielt diese Module passend zu Ihrem "
-"Profil installieren."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-"Dieses Modul erlaubt Ihnen das Hinzufügen von Sub-Produkten in Stücklisten."
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "Profil für Produktionsbetriebe"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr "profile.manufacturing.config.install_modules_wizard"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-"Hiermit werden CRM Features installiert: Lead und Opportunities "
-"Historienverwaltung, Gruppenkalender, Auftragshistorie, Fehlerticketsystem "
-"u.s.w."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Installiere"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "CRM und Kalender"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Reparaturmanagement"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr "Zeigt Margen bei Verkaufsauftrag"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-"Dieses Modul erlaubt ein Point of Sale System. Es bietet hierzu die "
-"Grundlagen. Sie sollten auch das POS Frontend evaluieren welches perfekt "
-"Ergonomie bietet, z.B. durch Touchscreen Features und Kassenanbindung."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "Produktion Subprodukt"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Verkauf"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Warnungen"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "Margen Verkaufsauftrag"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-"Erlaubt ein erweitertes Management der Logistik mit unterschiedlichen "
-"Lagerorten. Sie können produktbezogen definieren: Standard Lagerorte, Pfad "
-"des Warenflusses nach Produkten etc. Dieses Modul wird eingesetzt bei: "
-"Lokalisierung von Produkten, Management des Warenflusses in der Produktion, "
-"Mietprodukte etc."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Point of Sale"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "Weitere Lagerorte"
diff --git a/addons/profile_manufacturing/i18n/el.po b/addons/profile_manufacturing/i18n/el.po
deleted file mode 100644
index 5a7b7b781ea..00000000000
--- a/addons/profile_manufacturing/i18n/el.po
+++ /dev/null
@@ -1,265 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-12-17 20:25+0000\n"
-"Last-Translator: Andreas Porevopoulos <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-06-22 04:14+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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "Βιομηχανικές Λειτουργίες"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr "Προφίλ Μεταποιητικής Βιομηχανίας"
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "Προγραμματισμός Just in Time (JΙT)"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr "Διαχείριση ανά Ημερολόγιο"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Διαχείριση Σχέσεων"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr "Αυτό το Άρθρωμα σας επιτρέπει να διαχειριστείτε ένα σύστημα Πύλης."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"Το Σύστημα Διαχείρισης Εγγράφων του Open ERP σας επιτρέπει να ανοίγετε, να "
-"αποθηκεύετε, να εντοπίζετε και να ευρετηροποιείτε κάθε είδος εγγράφου "
-"(εσωτερικά έγγραφα, εκτυπωμένες αναφορές, ημερολόγια). Ανοίγει μια πρόσβαση "
-"FTP ώστε οι χρήστες να πλοηγούνται εύκολα στα σχετικά έγγραφα."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-"Αυτό το Άρθρωμα σας επιτρέπει να διαχειριστείτε τις πωλήσεις σας, "
-"τιμολογώντας και παραλαμβάνωντας ανά ημερολόγιο. Μπορείτε να ορίσετε "
-"ημερολόγια για οχήματα μεταφοράς, πωλητές, τμήματα, ημερ/νίες τιμολογίων, "
-"κλπ."
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "Προφίλ Μεταποιητικής Βιομηχανίας: Εγκατάσταση Επιπλέον Αρθρωμάτων"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-"Το Άρθρωμα JΙT σας επιτρέπει να μην τρέχετε περιοδικά χρονοδιαγράμματα. "
-"Είναι ευκολοτερο και γρηγορότερο για υπολογισμό αποθεμάτων σε πραγματικό "
-"χρόνο αλλά, από την άλλη μεριά, είναι λιγότερο αποτελεσματικό με την "
-"προτεραιότητα των προμηθειών."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-"Το Άρθρωμα αυτό σας επιτρέπει τη διαχείριση ανά εντολή παραγωγής αλλά και "
-"ανά εντολή εργασίας. Θα μπορείτε να προγραμματίσετε, να αναλύσετε το κόστος, "
-"να ελέγξετε τους χρόνους κλπ σε όλες τις λειτουργίες κάθε εντολής παραγωγής."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Διαχείριση Εγγράφων"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Πύλη"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "Απόθεμα και Μεταποίηση"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-"Σας επιτρέπει τη διαχείριση επιδιορθώσεων προϊόντων καθώς και τις "
-"ημερομηνίες λήξης της εγγύησης και την ιμλόγηση προϊόντων και υπηρεσιών."
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-"Εγκαταστήστε περισσότερα Αρθρώματα. Κάποια σας προτείνονται ανάλογα με το "
-"Προφίλ Μεταποίησης που επιλέξατε. Μπορείτε να τα εγκαταστήσετε ανάλογα με "
-"τις ανάγκες σας."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-"Αυτό το Άρθρωμα σας επιτρέπει να προσθέτετε υποπροϊόντα στις ΚΥ του mrp."
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "Manufacturing industry profile"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr "profile.manufacturing.config.install_modules_wizard"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-"Αυτό εγκαθιστά τις λειτουργίες διαχείρισης πελατειακών σχέσεων όπως "
-"σύνδεσμοι, κοινό ημερολόγιο συσκέψεων, ανίχνευση σφαλμάτων κ.α."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Εγκατάσταση"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "CRM και Ημερολόγια"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Επιδιόρθωση"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr "Εμφάνιση περιθωρίων στη φόρμα παραγγελίας πώλησης"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-"Αυτό το Άρθρωμα σας επιτρέπει τη διαχείριση ενός συστήματος point of sale. "
-"Προσφέρει μια βασική φόρμα λειτουργιών pos. Πρέπει να δείτε επίσης το "
-"προηγμένο μας σύστημα point of sale για τέλεια εργονομία με touchscreen και "
-"ταμειακές μηχανές."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "Υποπροϊόν Mrp"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Διαχείριση Πωλήσεων"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Προσοχή"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "Περιθώρια σε Παραγγελία Πώλησης"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-"Σας επιτρέπει τη διαχείριση ενός προηγμένου συστήματος τροφοδοσίας με "
-"διάφορες τοποθεσίες εκτέλεσεις των εκάστοτε λειτουργιών ή της αποθήκευσης "
-"ανά προϊόν. Αυτό το Άρθρωμα χρησιμοποιείται συνήθως για διαχείριση πλάνων "
-"παραγωγής, προσαρμογή των προϊόντων σε τοπικές αγορές, τοποθεσίες ποιοτικού "
-"ελέγχου, ενοικιασμένα προϊόντα κλπ."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Point of Sale"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "Αναβαθμισμένες Τοποθεσίες"
diff --git a/addons/profile_manufacturing/i18n/es.po b/addons/profile_manufacturing/i18n/es.po
deleted file mode 100644
index 8f34431aa66..00000000000
--- a/addons/profile_manufacturing/i18n/es.po
+++ /dev/null
@@ -1,267 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-11-17 10:58+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "Operaciones de fabricación"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr "Perfil para industrias manufactureras (fabricación)"
-
-#. module: profile_manufacturing
-#: 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_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "Planificación justo a tiempo (JIT)"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr "Gestionar por diarios"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Gestión relaciones con el cliente"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr "Este módulo permite gestionar un sistema de portal web."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"El sistema de gestión de la documentación de OpenERP le permite almacenar, "
-"navegar, clasificar automáticamente, buscar y visualizar todo tipo de "
-"documentos (documentos internos, informes impresos, sistema de calendario). "
-"Abre un acceso de FTP para que los usuarios naveguen fácilmente en los "
-"documentos asociados."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-"Este módulo le permite gestionar sus ventas, facturación y envíos por "
-"diarios. Puede definir diarios para camiones, comerciales, departamentos, "
-"fecha de facturación, periodo de envío, etc."
-
-#. module: profile_manufacturing
-#: 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_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "Perfil de fabricación: Instalar módulos extras"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-"El módulo JIT le permite no tener que ejecutar el planificador "
-"periódicamente. Es más fácil y más rápido para calcular el stock en tiempo "
-"real pero, por el contrario, gestiona menos eficazmente prioridades en "
-"abastecimientos."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-"Este módulo le permite, no sólo gestionar por orden de producción, si no "
-"también por pedido/operación de trabajo. Será capaz de planificar, analizar "
-"el coste, verificar tiempos, ... en todas las operaciones de cada orden de "
-"fabricación"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestión de documentos"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Portal"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "Stock & Fabricación"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-"Permite gestionar reparaciones de producto. Tiene en cuenta la fecha límite "
-"de garantía y la facturación de productos y servicios."
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-"Instale más módulos. Se proponen unos cuantos módulos relacionados con el "
-"perfil de fabricación que ha seleccionado. Los podrá instalar a partir de "
-"nuestros requisitos."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-"Este módulo le permite añadir sub productos en listas de materiales (LdM) en "
-"la planificación de fabricación de recursos (MRP)."
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "Perfil industria manufacturera"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr "perfil.fabricacion.config.asistente_instal_modulos"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-"Esto instala funcionalidades de relación con el cliente como: Seguimiento de "
-"iniciativas y oportunidades, calendario compartido, seguimiento de trabajos, "
-"seguimiento de incidencias, etc."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "CRM y calendarios"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Reparar"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr "Mostrar márgenes en el formulario de pedidos de venta."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-"Este módulo le permite gestionar un sistema de punto de venta (TPV). Ofrece "
-"un formulario básico para operaciones de TPV. Deberá testear también nuestro "
-"cliente punto de venta para una ergonomía perfecta con pantallas táctiles y "
-"periféricos para procesar los pagos."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "Sub productos en la fabricación (MRP)"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Gestión de ventas"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "Márgenes en pedidos de venta"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-"Permite gestionar una logística avanzada con ubicaciones diferentes. Puede "
-"definir, por producto: ubicaciones por defecto, rutas de ubicaciones para "
-"diferentes operaciones, etc. Este módulo se utiliza a menudo para: "
-"localización de productos, gestión de una cadena de fabricación, un control "
-"de calidad por ubicación, producto que se alquila, etc."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Terminal Punto de Venta"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "Ubicaciones avanzadas"
diff --git a/addons/profile_manufacturing/i18n/es_AR.po b/addons/profile_manufacturing/i18n/es_AR.po
deleted file mode 100644
index 53ca50958d3..00000000000
--- a/addons/profile_manufacturing/i18n/es_AR.po
+++ /dev/null
@@ -1,266 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-09-23 15:18+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-06-22 04:15+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "Operaciones de fabricación"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr "Perfil para industrias de fabricación"
-
-#. module: profile_manufacturing
-#: 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_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "Programación Just In Time"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr "Gestionar por diarios"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Gestión de relaciones"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr "Este módulo permite gestionar un sistema de portal web."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"El sistema de gestión de la documentación de OpenERP le permite almacenar, "
-"navegar, indexar automáticamente, buscar y previsualizar todo tipo de "
-"documentos (documentos internos, informes impresos, sistema de calendario). "
-"Abre un acceso de FTP para que los usuarios naveguen fácilmente en los "
-"documentos de asociación."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-"Este módulo le permite gestionar sus ventas, facturación y picking por "
-"diarios. Puede definir diarios para camiones, vendedores, departamentos, "
-"fecha de facturación, periodo de envío, etc."
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "Perfil de fabricación: Instalar módulos extras"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-"El módulo JIT le permite no tener que ejecutar el planificador "
-"periódicamente. Es más fácil y más rápido para calcular el stock en tiempo "
-"real pero, por el contrario, gestiona menos eficazmente prioridades en "
-"abastecimientos."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-"Este módulo le permite, no sólo gestionar por orden de producción, si no "
-"también por pedido/operación de trabajo. Ud. podrá planificar, analizar el "
-"coste, verificar tiempos, ... en todas las operaciones de cada orden de "
-"fabricación"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestión de documentos"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Portal"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "Stock & Fabricación"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-"Permite gestionar reparaciones de producto. Tiene en cuenta la fecha límite "
-"de garantía y la facturación de productos y servicios."
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista !"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-"Instale más módulos. Se proponen unos cuantos módulos de acuerdo con el "
-"perfil de fabricación que ha seleccionado. Los podrá instalar a partir de "
-"nuestras necesidades"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-"Este módulo le permite añadir sub productos en listas de materiales (LdM) en "
-"MRP"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "Perfil de industrias de fabricación"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr "perfil.fabricacion.config.asistente_instal_modulos"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-"Esto instala funcionalidades de relación con el cliente como: Seguimiento de "
-"iniciativas y oportunidades, calendario compartido, seguimiento de trabajos, "
-"seguimiento de incidencias, etc."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "CRM y calendarios"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Reparar"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr "Mostrar márgenes en el formulario de pedidos de venta."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-"Este módulo le permite gestionar un sistema de punto de venta (TPV). Ofrece "
-"un formulario básico para operaciones de TPV. Deberá testear también nuestro "
-"cliente punto de venta para una ergonomía perfecta con touchscreens y "
-"hardware para procesar los pagos."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "Sub producto MRP"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Gestión de ventas"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "Márgenes de pedidos de venta"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-"Permite gestionar una logística avanzada con ubicaciones diferentes. Puede "
-"definir, por producto: ubicaciones predeterminadas, rutas de ubicaciones "
-"para diferentes operaciones, etc. Este módulo se utiliza a menudo para: "
-"localización de productos, gestión de cadena de fabricación, un control de "
-"calidad por ubicación, producto que se alquila, etc."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Punto de Venta"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "Ubicaciones avanzadas"
diff --git a/addons/profile_manufacturing/i18n/et.po b/addons/profile_manufacturing/i18n/et.po
deleted file mode 100644
index f8b47e57ffa..00000000000
--- a/addons/profile_manufacturing/i18n/et.po
+++ /dev/null
@@ -1,261 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-02-02 09:20+0000\n"
-"Last-Translator: Tanel Kurvits <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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "Tootmisoperatsioonid"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr "Profiil tootmistööstuse jaoks"
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "Täpselt ajas planeerimine"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr "Halda päevikutega"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Suhete haldus"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr "See moodul võimaldab sul hallata portaalisüsteemi."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"Open ERP dokumendihaldussüsteem võimaldab sul säilitada, sirvida, "
-"automaatselt indekseerida, otsida ja eelvaadata kõiki dokumendiliike "
-"(sisemised dokumendid, prinditud aruandeid, kalendrisüsteemi). See avab "
-"kasutajatele FTP ligipääsu, et lihtsalt sirvida ühingu dokumente."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-"See moodul võimaldab sul hallata oma müüke, arveldamist ja noppimist "
-"päevikute abil. Sa saad määratleda päevikuid veokitele, müügimeestele, "
-"osakondadele, arve laekumise perioodidele jms."
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "Tootmise profiil: Paigalda lisamoodulid"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-"JIT moodul võimaldab sul käivitada planeerijat mitteperioodiliselt. See on "
-"lihtsam ja kiirem reaalajas invertuuriarvutuste jaoks kuid vastandiks haldab "
-"see vähemefektiivselt prioriteete hangetes."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-"See moodul võimaldab sul hallata mitte ainult tootmiskäsu vaid ka "
-"töökäsu/operatsiooni järgi. Sa saad planeerida, analüüsida kulusid, "
-"kontrollida aegu jms igal operatsioonil kõigil tootmiskäskudel."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Dokumendihaldus"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Portaal"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "Ladu ja tootmine"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-"Luba toodete parandamise haldamist. Käsitle garaniii piiraega ja toodete "
-"ning teenuste arveldamist."
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-"Paigalda veel mooduleid. Mõned moodulid soovitatakse vastavalt sinu poolt "
-"valitud tootmise profiilile. Sa saad neid paigaldada vastavalt meie "
-"vajadustele."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-"See moodul võimaldab sul lisada tooteid tootmisvahendite materjalidesse."
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "Tootmistööstuse profiil"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr "profile.manufacturing.config.install_modules_wizard"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-"See paigaldab kliendisuhete funktsioone nagu näiteks: juhtimise ja "
-"võimaluste jälgimine, jagatud kalender, tööde jälgimine, vigade jälgimine "
-"jne."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Paigalda"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "KSH ja kalendrid"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Paranda"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr "Kuva marginaalid müügikäsu vormidel."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-"See moodul võimaldab sul hallata müügikoha süsteemi. See pakub baasvormi "
-"müügikoha operatsioonide jaoks. Samuti peaksid sa proovima meie müügikoha "
-"kasutajaliidest perfektse ergonoomika jaoks puutetundliku ekraani ja "
-"maksetöötlemis riistavara kasutamisel."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "Tootmisvahendite alamtoode"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Turundusjuhtimine"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Hoiatus"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "Marginaalid müügikäskudel"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-"Võimaldab sul hallata laiendatud logistikat erinevate asukohtadega. Sa saad "
-"määratleda toote järgi: vaikimisi asukohta, asukohtade rada erinevate "
-"operatsioonide jaoks jms. Seda moodulit kasutatakse tihti: toodete "
-"lokaliseerimiseks, tootmisketi haldamiseks, kvaliteedikontrolliks, "
-"renditavate toodete jaoks jms."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Loobu"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Müügikoht"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "Laiendatud asukohad"
diff --git a/addons/profile_manufacturing/i18n/fr.po b/addons/profile_manufacturing/i18n/fr.po
deleted file mode 100644
index 1f20351c62d..00000000000
--- a/addons/profile_manufacturing/i18n/fr.po
+++ /dev/null
@@ -1,266 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2010-02-05 18:41+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "Opérations de fabrication"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr "Profil pour les industries manufacturières"
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "Planification en juste-à-temps"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr "Gérer par journaux"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Gestion de la relation"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr "Ce module vous permet de gérer un système de portail."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"Le système de gestion documentaire d'OpenERP vous permet de stocker, "
-"parcourir, indexer automatiquement, rechercher et pré-visualiser tout type "
-"de documents : documents internes ; rapports imprimés ; calendrier. Il "
-"permet un accès FTP pour que les utilisateurs puissent facilement parcourir "
-"les documents associés."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-"Ce module vous permet de gérer vos ventes, votre facturation et vos "
-"colisages en vous appuyant sur des journaux. Vous pouvez définir des "
-"journaux pour des camions, vendeurs, départements, date de facturation, "
-"période de livraison, etc."
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "Profil \"Fabrication\" : Installez des modules supplémentaires"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-"Le module juste-à-temps vous dispense d'exécuter le planificateur à "
-"intervalles réguliers. Il rend le calcul du stock en temps réel plus facile "
-"et plus rapide mais, en contrepartie, il gère moins efficacement les "
-"priorités des approvisionnements."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-"Ce module vous permet de gérer non seulement par ordre de production mais "
-"également par ordre de travail ou opération. Vous serez en mesure de "
-"planifier, d'analyser le coût, de contrôler les temps, ... sur toutes les "
-"opérations de fabrication de chaque ordre de fabrication."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestion documentaire"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Portail"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "Stock & fabrication"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-"Permet de gérer les réparations de produits. Tient compte des date de fin de "
-"garantie, et permet la facturation des produits et services."
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue !"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-"Installez d'autres modules : quelques modules sont proposés pour compléter "
-"le profil \"Fabrication\" que vous avez choisi. Vous serez en mesure de les "
-"installer selon vos besoins."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-"Ce module vous permet d'ajouter des composants dans les nomenclatures MRP."
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "Profil pour l'industrie manufacturière"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr "profile.manufacturing.config.install_modules_wizard"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-"Ceci installe les fonctionnalités de relation client telles que : le suivi "
-"des prospects et opportunités, agenda partagé, suivi des tâches, gestion de "
-"tickets ou de bogues, etc."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Installer"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "CRM et calendriers"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Réparation"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr "Affiche les marges sur le formulaire de commande de vente."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-"Ce module vous permet de gérer un système de point de vente. Il propose un "
-"formulaire de base pour les opérations de caisse. Vous devez également vous "
-"renseigner sur notre frontal pour point de vente pour une parfaite ergonomie "
-"avec écran tactile et matériel de traitement de paiement."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "Composants pour MRP"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Gestion des ventes"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Avertissement"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "Marges sur ventes"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-"Vous permet de gérer une logistique avancée avec différents emplacements. "
-"Vous pouvez définir, par produit : L’emplacement par défaut, les chemins des "
-"différentes opérations, etc. Ce module est souvent utilisé pour : la "
-"localisation des produits ; la gestion de chaîne de fabrication ; le lieu de "
-"contrôle de la qualité, la location de produits, etc."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Point de vente"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "Emplacements avancés"
diff --git a/addons/profile_manufacturing/i18n/hr.po b/addons/profile_manufacturing/i18n/hr.po
deleted file mode 100644
index ec7bb5baa4c..00000000000
--- a/addons/profile_manufacturing/i18n/hr.po
+++ /dev/null
@@ -1,230 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-11-17 10: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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "Proizvodne Operacije"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nevažeće ime modela u definiciji akcije."
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Portal"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za Arhitekturu Prikaza!"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "Profil proizvodne industrije"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instaliraj"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Popravi"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Upozorenje"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Poništi"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "Napredne Lokacije"
diff --git a/addons/profile_manufacturing/i18n/hu.po b/addons/profile_manufacturing/i18n/hu.po
deleted file mode 100644
index e0a7975fa4b..00000000000
--- a/addons/profile_manufacturing/i18n/hu.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/id.po b/addons/profile_manufacturing/i18n/id.po
deleted file mode 100644
index 189ab19eac9..00000000000
--- a/addons/profile_manufacturing/i18n/id.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-11-09 13:53+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/it.po b/addons/profile_manufacturing/i18n/it.po
deleted file mode 100644
index 41edfc41461..00000000000
--- a/addons/profile_manufacturing/i18n/it.po
+++ /dev/null
@@ -1,231 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-09-08 15:18+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "Programmazione Just in Time"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Gestione deile Relazioni"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestione Documentale"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr "profile.manufacturing.config.install_modules_wizard"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Installa"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Annulla"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/ko.po b/addons/profile_manufacturing/i18n/ko.po
deleted file mode 100644
index a24cdffe5cb..00000000000
--- a/addons/profile_manufacturing/i18n/ko.po
+++ /dev/null
@@ -1,240 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-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"
-"PO-Revision-Date: 2009-09-08 12:18+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "제조 오퍼레이션"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr "제조업 프로파일"
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "JIT 스케줄링"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr "저널 별 관리"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "관계 관리"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr "이 모듈을 포털 시스템을 관리하는데 이용됩니다."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-"이 모듈은 판매, 인보이싱과 피킹을 저널 별로 관리하도록 도와 주며, 트럭, 세일즈맨, 부서, 인보이싱 날짜, 배송 기간 등 각각에 대해 "
-"저널을 정의할 수 있습니다."
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "제조업 프로파일: 추가 모듈 설치"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-"JIT 모듈을 통해 주기적으로 스케줄러를 운용할 수 있습니다. 실시간 재고 계산을 쉽고 빨리 수행할 수 있지만, 조달의 우선 순위 관리 "
-"작업에는 별로 유용하지 않습니다."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-"이 모듈을 통해, 생산 주문과 작업 주문/오퍼레이션을 관리할 수 있습니다. 각 제조 주문의 모든 오퍼레이션에 대해 원가 분석과 시간 테크 "
-"등을 수행할 수 있습니다."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "문서 관리"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "포털"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "재고 & 제조"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr "제품 수리 관리. 보증 한도 날짜, 상품과 서비스의 인보이싱을 다룹니다."
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr "추가 모듈 설치. 귀하가 선택한 제조 프로파일에 따라 몇몇 모듈들이 추가 설치됩니다."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr "이 모듈을 통해 MRP BOM에 하위 상품들을 추가할 수 있습니다."
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "제조업 프로파일"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr "리드와 기회 추적, 카렌더 공유, 직무 추적, 버그 추적 등 고객 관계 기능들을 설치합니다."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "설치"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "CRM과 카렌더"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "수리"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr "판매 주문 양식에 마진 표시"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-"이 모듈을 통해, POS를 관리할 수 있습니다. POS 오퍼레이션을 위한 기본 양식을 제공하며, 터치스크린 기기와 결제 처리 "
-"하드웨어등으로 구성되는 온전한 POS 환경을 위한 프로트엔드를 체크해 보십시오."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "MRP 하위 상품"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "판매 관리"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "경고"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "판매 주문 마진"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-"상이한 위치들로 구성된 복잡한 물류 시스템을 관리할 수 있도록 도와드립니다. 상품 별, 디폴트 위치, 상이한 오퍼레이션을 위한 위치 경로 "
-"등을 정의할 수 있으며, 상품의 현지화, 제조 체인 관리, 품질 컨트롤 위치, 임대 상품 관리 등을 수행할 수 있습니다."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "취소"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "POS"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "고급 위치"
diff --git a/addons/profile_manufacturing/i18n/lt.po b/addons/profile_manufacturing/i18n/lt.po
deleted file mode 100644
index e0a7975fa4b..00000000000
--- a/addons/profile_manufacturing/i18n/lt.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/nl.po b/addons/profile_manufacturing/i18n/nl.po
deleted file mode 100644
index 44d4a54dbca..00000000000
--- a/addons/profile_manufacturing/i18n/nl.po
+++ /dev/null
@@ -1,267 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2010-04-22 10:54+0000\n"
-"Last-Translator: Jan Verlaan (Veritos) <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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "Productie operaties"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr "Profiel voor productie industrie"
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "Just in time planning"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr "Beheer middels dagboeken"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Relatiebeheer"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr "Deze module helpt u het portaal-systeem te beheren."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"Met het documentbeheersysteem van OpenERP kunt u allerlei documenten "
-"(interne documenten, afgedrukte overzichten, agenda's) opslaan, "
-"doorbladeren, automatisch indexeren, zoeken en inzien.\r\n"
-"Het systeem maakt gebruik van FTP toegang zodat gebruikers eenvoudig bij de "
-"documenten kunnen komen."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-"Deze module help u uw verkopen, facturatie en materiaal picking the beheren "
-"middels dagboeken. U kunt dagboeken definiëren voor vrachtwagens, verkopers, "
-"afdelingen, factuurdatum aflever periode, enz."
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "Installeer extra modulen"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-"De JIT (Just in Time) module stelt u in staat een directe mrp-planningsrun "
-"van het actieve product bij wijzigingen te laten uitvoeren. Dit is "
-"makkelijker en sneller in gebruik voor real time voorraad berekening, maar "
-"heeft als nadeel dat het minder efficiënt prioriteiten kan stellen bij "
-"genereren van inkoopaanvragen."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-"Deze module stelt u in staat om niet alleen de productie order te beheren, "
-"maar ook de operaties. U zult in staat zijn om te plannen, haar kosten te "
-"analyseren, tijden te controleren, ... over alle operaties van elke "
-"productieorder."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Documentbeheer"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Portaal"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "Voorraad en productie"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-"Deze module stelt u in staat om productreparaties te beheren. Beheer "
-"garantietermeinen en de facturatie van producten en services."
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-"Installeer meer modules. Enkele modules worden voorgesteld in "
-"overeenstemming met dit productieprofiel dat u heeft geselecteerd. U zult in "
-"staat om deze modules te installeren waarbij OpenERP rekening houd met de "
-"benodigde afhankelijkheden."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-"Deze module stelt u in staat om subproducten toe te voegen in de BOM (Bill "
-"of Materials)"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "Productie industrie profiel"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr "profile.manufacturing.config.install_modules_wizard"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-"Deze module installeert de Customer Relation Management (CRM) uitbreidingen "
-"als: volgen van leads en kansen, gedeelde agenda's, HRM werving- & "
-"selectieproces, foutenrapportbeheer, enz."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Installeren"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "CRM en calenders"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Reparatie"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr "Toont marges op het verkooporderformulier."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-"Deze module stelt u in staat om een kassa systeem (POS) te beheren. Het bied "
-"een basis formulier voor kassa operaties. Selecteert u ook onze "
-"gebruikersinterface kassa systeem voor een uitstekende ergonomy met "
-"touchscreen schermen en betaalautomaten hardware."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "Mrp sub-product"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Verkoopbeheer"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "Marges op verkooporder"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-"Stelt u in staat om geavanceerde logistiek te beheren met diverse locaties "
-"en magazijnen. U kunt per product definiëren: standaard locaties voor  "
-"verschillende operaties, etc. Deze module wordt vaak gebruikt voor "
-"lokalisatie van producten, beheren van en productieketen, kwaliteitscontrole "
-"lokaties, bij verhuur van producten, enz."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Verkooppunt"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "Uitgebreide locaties"
diff --git a/addons/profile_manufacturing/i18n/nl_BE.po b/addons/profile_manufacturing/i18n/nl_BE.po
deleted file mode 100644
index 064f7813ca6..00000000000
--- a/addons/profile_manufacturing/i18n/nl_BE.po
+++ /dev/null
@@ -1,230 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-04-10 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-06-22 04:15+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/pl.po b/addons/profile_manufacturing/i18n/pl.po
deleted file mode 100644
index 33d2566706e..00000000000
--- a/addons/profile_manufacturing/i18n/pl.po
+++ /dev/null
@@ -1,262 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2010-05-25 16:49+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "Operacje produkcyjne"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr "Profil dla firm produkcyjnych"
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "Planowanie natychmiastowe (JiT)"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr "Zarządzanie wg dzienników"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Zarządzanie relacjami"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr "Ten moduł pozwoli ci zarządzać systemem portalu."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"System zarządzania dokumentami w OpenERP pozwala przechowywać, przeglądać, "
-"automatycznie indeksować, przeszukiwać i podglądać wszystkie rodzaje "
-"dokumentów (dokumenty wewnętrzne, drukowane raporty, kalendarze). Otwiera on "
-"dla użytkowników dostęp FTP do łatwego przeglądania powiązanych dokumentów."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-"Ten moduł pozwala zarządzać sprzedażą, fakturowaniem i pobieraniem produktów "
-"przez dzinniki. Możesz definiować dzienniki dla ciężarówek, sprzedawców, "
-"działów, dat fakturowania, okresów dostaw itp."
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "Profil produkcyjny: Instaluj dodatkowe moduły"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-"Moduł JIT pozwala działać planiście bez jego uruchamiania. Jest to szybsze i "
-"łatwiejsze dla obliczeń zapasów w czasie rzeczywistym, ale nieefektywne w "
-"zarządzaniu priorytetami w nabyciach."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-"Ten moduł pozwala nie tylko zarządzać produkcją przez zamówienia produkcji, "
-"ale również przez zamówienia czynności/operacje. Będziesz mógł planować, "
-"analizować koszt, sprawdzać czas, ... dla wszystkich operacji w każdym "
-"zamówieniu produkcyjnym"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Zarządzanie dokumentami"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "Zapasy i Produkcja"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-"Pozwala zarządzać naprawami produktów. Obsługuje czasy gwarancji i "
-"fakturowanie produktów i usług."
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-"Instaluj więcej modułów. Proponujemy moduły zalecane do profilu "
-"produkcyjnego, który wybrałeś. Będziesz mógł je instalować według naszych "
-"wskazań."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-"Ten moduł pozwala dodać produkty uboczne w zestawieniu materiałowym MRP."
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "Profil firm produkcyjnych"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-"To instaluje funkcjonalność relacji z klientami jak: obsługa sygnałów i "
-"szans, współdzielone kalendarze, obsadzanie stanowisk, obsługa błędów itp."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instaluj"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "CRM i kalendarze"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Naprawa"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr "Wyświetlaj marże na formularzu zamówienia sprzedaży."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-"Ten moduł pozwala obsługiwać punkt sprzedaży. Zawiera podstawową formę "
-"operacji punktu sprzedaży. Musisz sprawdzić jeszcze nasz punkt sprzedaży dla "
-"sprzedawcy (frontend), zby się przekonać o ergonomii ekranu dotykowego i "
-"urządzeń do obsługi płatności."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "Produkt uboczny MRP"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Sprzedaż"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "Marże w zamówieniu sprzedaży"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-"Pozwala zarządzać zaawansowaną logistyką z różnymi strefami. Możesz "
-"zdefiniować, według produktu: domyślną strefę, ścieżkę stref dla różnych "
-"operacji, itp. Moduł ten jest zwykle stosowany do: lokalizacji produktów, "
-"zarządzania łańcuchem produkcyjnym, stref kontroli jakości, produktów "
-"wypożyczanych, itp."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Punkt sprzedaży"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "Zaawansowane strefy"
diff --git a/addons/profile_manufacturing/i18n/profile_manufacturing.pot b/addons/profile_manufacturing/i18n/profile_manufacturing.pot
deleted file mode 100644
index e94d39ff4e6..00000000000
--- a/addons/profile_manufacturing/i18n/profile_manufacturing.pot
+++ /dev/null
@@ -1,198 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01: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: \n"
-"Plural-Forms: \n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "This module  allows you to manage your sales, invoicing and picking by journals. You can define journals for trucks, salesman, departments, invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "The JIT module allows you to not run the scheduler periodically. It's easier and faster for real time stock computation but, in counter-part, it manages less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "This module allows you to not only manage by production order but also by work order/operation. You will be able to planify, analyse the cost, check times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Allow to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid "Install more modules. A few modules are proposed according to the manufacturing profile you selected. You will be able to install them based on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "This module allows you to manage a point of sale system. It offers a basic form for pos operations. You must also check our frontend point of sale for a perfect ergonomy with touchscreen materials and payment processing hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Allows you to manage an advanced logistic with different locations. You can define, by product: default locations, path of locations for different operations, etc. This module is often used for: localisation of products, managing a manufacturing chain, a quality control location, product that you rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
-
diff --git a/addons/profile_manufacturing/i18n/pt.po b/addons/profile_manufacturing/i18n/pt.po
deleted file mode 100644
index c695728f1b3..00000000000
--- a/addons/profile_manufacturing/i18n/pt.po
+++ /dev/null
@@ -1,230 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-09-08 12:04+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Gestão de relacionamento"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/pt_BR.po b/addons/profile_manufacturing/i18n/pt_BR.po
deleted file mode 100644
index 1e1829fdee9..00000000000
--- a/addons/profile_manufacturing/i18n/pt_BR.po
+++ /dev/null
@@ -1,236 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2010-05-01 19:21+0000\n"
-"Last-Translator: sbrianti <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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "Operações de Manufatura"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr "Perfil para indústrias de manufatura"
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "Agendamento de Just in Time"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr "Gerenciamento por Diários"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Gestão de Relacionamentos"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr "Este módulo permite o gerenciamento de um sistema de portal."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"O Sistema de Gerenciamento de Documentos do Open ERP permite que você "
-"armazene, navegue, indexe automaticamente, busque e pré-visualize todos os "
-"tipos de documentos (documentos internos, relatórios impressos, sistema de "
-"calendário). Ele abre um acesso FTP para que os usuário naveguem com "
-"facilidade pelos documentos."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "Perfil de manufatura: Instalar módulos extras"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gerenciamento de Documentos"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Portal"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "Estoque e Manufatura"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr "Este módulo permite a inserção de subprodutos em um BoM de MRP."
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "Perfil de indústria de manufatura"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "CRM e Calendários"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "Subproduto de MRP"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Gerenciamento de Vendas"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "Margens em Ordens de Venda"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Ponto de Venda"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "Locais Avançados"
diff --git a/addons/profile_manufacturing/i18n/ro.po b/addons/profile_manufacturing/i18n/ro.po
deleted file mode 100644
index e0a7975fa4b..00000000000
--- a/addons/profile_manufacturing/i18n/ro.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/ru.po b/addons/profile_manufacturing/i18n/ru.po
deleted file mode 100644
index 3349054aa71..00000000000
--- a/addons/profile_manufacturing/i18n/ru.po
+++ /dev/null
@@ -1,231 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2010-07-11 08:59+0000\n"
-"Last-Translator: Pomazan Bogdan <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-07-12 03:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Управление отношениями"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Управление документами"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Портал"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Установить"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Восстановление"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Управление продажами"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Внимание"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Отмена"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/sl.po b/addons/profile_manufacturing/i18n/sl.po
deleted file mode 100644
index 1472941af75..00000000000
--- a/addons/profile_manufacturing/i18n/sl.po
+++ /dev/null
@@ -1,230 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-11-19 00:43+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Upravljanje povezav"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Portal"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Namesti"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Popravi"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Upravljanje prodaje"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Opozorilo"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Prekliči"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Prodajno mesto"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/sq.po b/addons/profile_manufacturing/i18n/sq.po
deleted file mode 100644
index f56d99685e9..00000000000
--- a/addons/profile_manufacturing/i18n/sq.po
+++ /dev/null
@@ -1,396 +0,0 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23: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: \n"
-"Plural-Forms: \n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "This module  allows you to manage your sales, invoicing and picking by journals. You can define journals for trucks, salesman, departments, invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "The JIT module allows you to not run the scheduler periodically. It's easier and faster for real time stock computation but, in counter-part, it manages less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "This module allows you to not only manage by production order but also by work order/operation. You will be able to planify, analyse the cost, check times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Allow to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid "Install more modules. A few modules are proposed according to the manufacturing profile you selected. You will be able to install them based on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "This module allows you to manage a point of sale system. It offers a basic form for pos operations. You must also check our frontend point of sale for a perfect ergonomy with touchscreen materials and payment processing hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Allows you to manage an advanced logistic with different locations. You can define, by product: default locations, path of locations for different operations, etc. This module is often used for: localisation of products, managing a manufacturing chain, a quality control location, product that you rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23: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: \n"
-"Plural-Forms: \n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "This module  allows you to manage your sales, invoicing and picking by journals. You can define journals for trucks, salesman, departments, invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "The JIT module allows you to not run the scheduler periodically. It's easier and faster for real time stock computation but, in counter-part, it manages less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "This module allows you to not only manage by production order but also by work order/operation. You will be able to planify, analyse the cost, check times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Allow to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid "Install more modules. A few modules are proposed according to the manufacturing profile you selected. You will be able to install them based on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "This module allows you to manage a point of sale system. It offers a basic form for pos operations. You must also check our frontend point of sale for a perfect ergonomy with touchscreen materials and payment processing hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Allows you to manage an advanced logistic with different locations. You can define, by product: default locations, path of locations for different operations, etc. This module is often used for: localisation of products, managing a manufacturing chain, a quality control location, product that you rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
-
diff --git a/addons/profile_manufacturing/i18n/sv.po b/addons/profile_manufacturing/i18n/sv.po
deleted file mode 100644
index 9a051418285..00000000000
--- a/addons/profile_manufacturing/i18n/sv.po
+++ /dev/null
@@ -1,230 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-04-10 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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: 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: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/tlh.po b/addons/profile_manufacturing/i18n/tlh.po
deleted file mode 100644
index c5c229a8b2d..00000000000
--- a/addons/profile_manufacturing/i18n/tlh.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/tr.po b/addons/profile_manufacturing/i18n/tr.po
deleted file mode 100644
index cd22bf5507d..00000000000
--- a/addons/profile_manufacturing/i18n/tr.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2010-02-14 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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "Üretim Operasyonları"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Döküman Yönetimi"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "Portal"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "CRM ve Takvim"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "Onarım"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "MRP Alt Ürünü"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "Satış Yönetimi"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "Uyarı"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "Satış Siparişindeki Kar"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "İptal"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Satış Noktası (POS)"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/uk.po b/addons/profile_manufacturing/i18n/uk.po
deleted file mode 100644
index 06f52ce1490..00000000000
--- a/addons/profile_manufacturing/i18n/uk.po
+++ /dev/null
@@ -1,230 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-09-08 14:54+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-06-22 04:14+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/i18n/vi.po b/addons/profile_manufacturing/i18n/vi.po
deleted file mode 100644
index 3358f5cf218..00000000000
--- a/addons/profile_manufacturing/i18n/vi.po
+++ /dev/null
@@ -1,396 +0,0 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00: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: \n"
-"Plural-Forms: \n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "This module  allows you to manage your sales, invoicing and picking by journals. You can define journals for trucks, salesman, departments, invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "The JIT module allows you to not run the scheduler periodically. It's easier and faster for real time stock computation but, in counter-part, it manages less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "This module allows you to not only manage by production order but also by work order/operation. You will be able to planify, analyse the cost, check times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Allow to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid "Install more modules. A few modules are proposed according to the manufacturing profile you selected. You will be able to install them based on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "This module allows you to manage a point of sale system. It offers a basic form for pos operations. You must also check our frontend point of sale for a perfect ergonomy with touchscreen materials and payment processing hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Allows you to manage an advanced logistic with different locations. You can define, by product: default locations, path of locations for different operations, etc. This module is often used for: localisation of products, managing a manufacturing chain, a quality control location, product that you rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00: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: \n"
-"Plural-Forms: \n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "This module  allows you to manage your sales, invoicing and picking by journals. You can define journals for trucks, salesman, departments, invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "The JIT module allows you to not run the scheduler periodically. It's easier and faster for real time stock computation but, in counter-part, it manages less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "This module allows you to not only manage by production order but also by work order/operation. You will be able to planify, analyse the cost, check times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Allow to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid "Install more modules. A few modules are proposed according to the manufacturing profile you selected. You will be able to install them based on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "This module allows you to manage a point of sale system. It offers a basic form for pos operations. You must also check our frontend point of sale for a perfect ergonomy with touchscreen materials and payment processing hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Allows you to manage an advanced logistic with different locations. You can define, by product: default locations, path of locations for different operations, etc. This module is often used for: localisation of products, managing a manufacturing chain, a quality control location, product that you rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
-
diff --git a/addons/profile_manufacturing/i18n/zh_CN.po b/addons/profile_manufacturing/i18n/zh_CN.po
deleted file mode 100644
index b35db514fec..00000000000
--- a/addons/profile_manufacturing/i18n/zh_CN.po
+++ /dev/null
@@ -1,233 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 09:14+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-06-22 04:15+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr "生产工序"
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr "制造业配置"
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr "JIT(准时生产)日程表"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr "分类帐管理"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "关系管理"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr "这模块允许你管理一个门户系统"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"文档管理系统你可以储存、浏览、自动索引、搜索和预览所有分类的文档(内部文档、打印报表、日程表系统).用户打开一个FTP访问以方便浏览相关文档."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr "这模块允许你管理你的销售、发票和领料/提货分类帐.你能定义跟踪、业务员、部门、发票日期交付期限等分类帐."
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "生产配置:安装额外的模块"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr "这JIT(准时生产)模块可以让你不运行定期调度.更容易和更快速实时计算库存.在相对部分它控制有效地减少优先产品需求."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr "该模块不仅可以让你管理生产单而且能管理工作单/工序.你将在每个生产单运作能规划、分析成本、检查时间."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "文档管理"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr "门户"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr "库存&生产"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr "允许你管理产品修理.处理保证期日期和产品、服务的发票"
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr "根据你选择的生产配置所推荐的几个模块.你将据此安装."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr "这模块允许你在MRP的物料清单中增加子产品."
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr "制造业配置"
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr "生产模块安装设置向导"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr "安装客户关系的功能:例如商机和销售机会跟踪、共享日程、职位跟踪、缺陷跟踪等."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr "安装"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr "客户关系管理和日程表"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr "修理"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr "显示这订单销售利润."
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr "这模块允许你管理POS系统.它提供一个基本模式为POS的操作.你必须检查POS前台有一个完美的触摸屏和付款处理POS硬件."
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr "MRP子产品"
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr "销售管理"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr "警告"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr "销售订单管理"
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr "允许你管理不同库位的高级逻辑.你能定义产品不同的库位、不同操作的库位路径等.这模块经常使用在:产品库位、管理一个生产链、质量控制等."
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "取消"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr "POS"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr "高级库位"
-
-#~ msgid "Able you to set warnings on products and partners."
-#~ msgstr "你可以设定产品和业务伙伴的警告."
diff --git a/addons/profile_manufacturing/i18n/zh_TW.po b/addons/profile_manufacturing/i18n/zh_TW.po
deleted file mode 100644
index a4fa057e6c4..00000000000
--- a/addons/profile_manufacturing/i18n/zh_TW.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_manufacturing
-#
-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"
-"PO-Revision-Date: 2009-01-30 13:15+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-06-22 04:15+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "Manufacturing Operations"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,description:profile_manufacturing.module_meta_information
-msgid "Profile for manufacturing industries"
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "Just in Time Scheduling"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "Manage by Journals"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "This module allows you to manage a Portal system."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid ""
-"This module  allows you to manage your sales, invoicing and picking by "
-"journals. You can define journals for trucks, salesman, departments, "
-"invoicing date delivery period, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid ""
-"The JIT module allows you to not run the scheduler periodically. It's easier "
-"and faster for real time stock computation but, in counter-part, it manages "
-"less efficiently priorities in procurements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid ""
-"This module allows you to not only manage by production order but also by "
-"work order/operation. You will be able to planify, analyse the cost, check "
-"times, ... on all operations of each manufacturing order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,portal:0
-msgid "Portal"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Stock & Manufacturing"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid ""
-"Allow to manage product repairs. Handle the guarantee limit date and the "
-"invoicing of products and services."
-msgstr ""
-
-#. module: profile_manufacturing
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"manufacturing profile you selected. You will be able to install them based "
-"on our requirements."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "This module allows you to add sub poducts in mrp bom."
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
-msgid "Manufacturing industry profile"
-msgstr ""
-
-#. module: profile_manufacturing
-#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
-msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid ""
-"This installs the customer relationship features like: leads and "
-"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
-"on."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "CRM and Calendars"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Repair"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Display margins on the sale order form."
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid ""
-"This module allows you to manage a point of sale system. It offers a basic "
-"form for pos operations. You must also check our frontend point of sale for "
-"a perfect ergonomy with touchscreen materials and payment processing "
-"hardware."
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
-msgid "Mrp Sub Product"
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,warning:0
-msgid "Warning"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
-msgid "Margins on Sales Order"
-msgstr ""
-
-#. module: profile_manufacturing
-#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid ""
-"Allows you to manage an advanced logistic with different locations. You can "
-"define, by product: default locations, path of locations for different "
-"operations, etc. This module is often used for: localisation of products, "
-"managing a manufacturing chain, a quality control location, product that you "
-"rent, etc."
-msgstr ""
-
-#. module: profile_manufacturing
-#: view:profile.manufacturing.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: profile_manufacturing
-#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Advanced Locations"
-msgstr ""
diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py
deleted file mode 100644
index 40bace350a7..00000000000
--- a/addons/profile_manufacturing/profile_manufacturing.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 fields, osv
-import pooler
-
-
-class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
-    _name='profile.manufacturing.config.install_modules_wizard'
-    _inherit = 'res.config.installer'
-
-    _columns = {
-        'mrp_jit':fields.boolean('Just in Time Scheduling',
-            help="The JIT module allows you to not run the scheduler "\
-                "periodically. It's easier and faster for real time "\
-                "stock computation but, in counter-part, it manages less "\
-                "efficiently priorities in requisitions."
-        ),
-        'sale_margin':fields.boolean('Margins on Sales Order',
-            help="Displays margins on the sale order form."),
-        'sale_crm':fields.boolean('CRM and Calendars',
-            help="This installs the customer relationship features like: "\
-            "leads and opportunities tracking, shared calendar, jobs "\
-            "tracking, bug tracker, and so on."),
-        'sale_journal':fields.boolean('Manage by Journals',
-            help="This module allows you to manage your " \
-              "sales, invoicing and picking by journals. You can define "\
-              "journals for trucks, salesman, departments, invoicing date "\
-              "delivery period, etc."
-            ),
-        'mrp_operation': fields.boolean('Manufacturing Operations',
-            help="This module allows you to not only manage by production order "\
-            "but also by work order/operation. You will be able to plan, "\
-            "analyse the cost, check times, ... on all operations of each "\
-            "manufacturing order"),
-        'stock_location': fields.boolean('Advanced Locations',
-            help="Allows you to manage an advanced logistic with different "\
-            "locations. You can define, by product: default locations, "\
-            "path of locations for different operations, etc. This module "\
-            "is often used for: localisation of products, managing a manufacturing "\
-            "chain, a quality control location, product that you rent, etc."\
-        ),
-        'warning': fields.boolean('Alerts',
-            help="Allows to manage alerts on products and partners that are "\
-            "showed on different events: sale order, invoice, purchase order, ..."),
-        'point_of_sale': fields.boolean('Point of Sale',
-            help="This module allows you to manage a point of sale system. "\
-            "It offers a basic form for pos operations. You must also check "\
-            "our frontend point of sale for a perfect ergonomy with touchscreen "\
-            "materials and payment processing hardware."),
-        'portal': fields.boolean('Portal',
-            help="This module allows you to manage a Portal system."),
-        'mrp_subproduct': fields.boolean('Mrp Sub Product',
-            help="This module allows you to add sub poducts in mrp bom."),
-         'warning': fields.boolean('Warning',
-            help="Makes you able to set warnings on products and partners."),
-        'board_document':fields.boolean('Document Management',
-            help= "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."),
-        'mrp_repair': fields.boolean('Repair',
-            help="Allows to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."),
-
-    }
-profile_manufacturing_config_install_modules_wizard()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
deleted file mode 100644
index bbbc64af57a..00000000000
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_confirm_install_module_form" model="ir.ui.view">
-            <field name="name">Manufacturing Profile: Install Extra Modules</field>
-            <field name="model">profile.manufacturing.config.install_modules_wizard</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_installer"/>
-            <field name="arch" type="xml">
-              <data>
-                <form position="attributes">
-                  <attribute name="string">Manufacturing Profile: Install Extra Modules</attribute>
-                </form>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  	<attribute name='rowspan'>15</attribute>
-			  		<attribute name='string'></attribute>
-			  	</xpath>
-                <xpath expr="//label[@string='description']"
-                       position="attributes">
-                  <attribute name="string">Here are a few modules which might be useful along with the rest of the Manufacturing profile. You can also install them the normal way later on, but if you think you'll need them to fit your requirements, you can select them now and they'll be installed immediately.</attribute>
-                </xpath>
-                <separator string="title" position="attributes">
-                  <attribute name="string">Stock &amp; Manufacturing</attribute>
-                </separator>
-                <group colspan="8">
-                  <field name="stock_location"/>
-                  <field name="mrp_jit"/>
-                  <field name="mrp_operation"/>
-                  <field name="mrp_subproduct"/>
-                  <field name="mrp_repair"/>
-                  <separator string="Sales Management" colspan="4"/>
-                  <field name="point_of_sale"/>
-                  <field name="sale_journal"/>
-                  <field name="sale_margin"/>
-                  <separator string="Relationship Management" colspan="4"/>
-                  <field name="sale_crm"/>
-                  <field name="board_document"/>
-                  <field name="warning"/>
-                  <field name="portal"/>
-                </group>
-              </data>
-            </field>
-        </record>
-        <record id="action_config_install_module" model="ir.actions.act_window">
-            <field name="name">Manufacturing Profile: Install Extra Modules</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">profile.manufacturing.config.install_modules_wizard</field>
-            <field name="view_id" ref="view_confirm_install_module_form"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-      <record model="ir.actions.todo"
-            id="config_install_module">
-        <field name="action_id" ref="action_config_install_module"/>
-        <field name="sequence">3</field>
-      </record>
-      <record id="manufacturing_ir_actions_todo_tree" model="ir.ui.view">
-		    <field name="model">ir.actions.todo</field>
-		    <field name="name">manufacturing_installer_action_replace</field>
-		    <field name="type">tree</field>
-		    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
-			<field name="arch" type="xml">
-	 			<xpath expr="//button[@string='Launch']" position="replace">
-        			<button name="%(action_config_install_module)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
-  				</xpath>
-  			</field>
-	</record>
-    </data>
-</openerp>
diff --git a/addons/profile_manufacturing/security/ir.model.access.csv b/addons/profile_manufacturing/security/ir.model.access.csv
deleted file mode 100644
index 892aa4bce00..00000000000
--- a/addons/profile_manufacturing/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_profile_manufacturing_config_install_modules_wizard_all","profile_manufacturing_config_install_modules_wizard_all","model_profile_manufacturing_config_install_modules_wizard","base.group_system",1,1,1,1
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
index 508a68e819f..45206fd081f 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Miscellaneous Tools",
     "version" : "1.0",
     "depends" : ["base"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Tools",
     "description": """Installs tools for lunch,survey,subscription and audittrail
     module
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index efef1dc3649..69250f0dcf1 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Tools Modules Installation</attribute>
+            <attribute name="string">Tools Modules Configuration</attribute>
           </form>
 	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
           	  <attribute name='string'></attribute>
@@ -20,7 +20,10 @@
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string"
-                       >Here are a few useful applications which, while they don't directly contribute to your business, can improve on it or improve your OpenERP experience</attribute>
+                       >Here are a few useful applications which, while they do not directly contribute to your business, can help you to improve your organization.</attribute>
+          </xpath>
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
+              <attribute name="string">Configure</attribute>
           </xpath>
           <group colspan="8">
             <field name="lunch"/>
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 726e87b5979..3a6134b76ae 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name": "Project Management",
     "version": "1.1",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "website": "http://www.openerp.com",
     "category": "Generic Modules/Projects & Services",
     "depends": ["product", "analytic", "mail_gateway", "board"],
@@ -56,7 +56,8 @@ work done on tasks, eso. It is able to render planning, order tasks, eso.
         'board_project_demo.xml',
     ],
     'test':[
-            'test/test_project.yml'
+            'test/test_project.yml',
+            'test/test_project_delegation.yml',
             ],
     'installable': True,
     'active': False,
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 6258c85f689..db2f09963e8 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -17,13 +17,33 @@
                     <field name="name"/>
                     <field name="project_id"/>
                     <field name="date_deadline"/>
-                    <field name="planned_hours"/>
-                    <field name="effective_hours"/>
                     <field name="priority"/>
+                    <field name="planned_hours" widget="float_time"/>
+                    <field name="effective_hours" widget="float_time"/>
+                    <field name="progress" widget="progressbar"/>
                 </tree>
             </field>
         </record>
-        
+
+        <record id="view_delegated_task_tree" model="ir.ui.view">
+            <field name="name">project.task.delegated.tree</field>
+            <field name="model">project.task</field>
+            <field name="type">tree</field>
+            <field eval="99" name="priority"/>
+            <field name="arch" type="xml">
+                  <tree colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date;black:date_deadline&gt;current_date" string="My Delegated Tasks">
+                    <field name="user_id"/>
+                    <field name="name"/>
+                    <field name="project_id"/>
+                    <field name="date_deadline"/>
+                    <field name="total_hours" widget="float_time"/>
+                    <field name="progress" widget="progressbar"/>
+                    <field name="type_id"/>
+                </tree>
+            </field>
+        </record>
+
+
         <record id="action_view_task_tree" model="ir.actions.act_window">
             <field name="name">My Open Tasks</field>
             <field name="res_model">project.task</field>
@@ -32,16 +52,16 @@
             <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
             <field name="view_id" ref="view_task_tree"/>
         </record>
-        
-        <record id="action_view_pending_task_tree" model="ir.actions.act_window">
-            <field name="name">My Pending Tasks</field>
+
+        <record id="action_view_delegate_task_tree" model="ir.actions.act_window">
+            <field name="name">My Delegated Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
-            <field name="view_id" ref="view_task_tree"/>
+            <field name="domain">[('parent_ids.user_id','=',uid),('state', 'in', ('draft','open','pending'))]</field>
+            <field name="view_id" ref="view_delegated_task_tree"/>
         </record>
-        
+
         <record id="action_view_task_tree_deadline" model="ir.actions.act_window">
             <field name="name">My Task's Deadlines</field>
             <field name="res_model">project.task</field>
@@ -87,7 +107,7 @@
                     <hpaned>
                         <child1>
                             <action colspan="4"  name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
-                            <action colspan="4"  name="%(action_view_pending_task_tree)d" string="My Pending Tasks" width="510"/>
+                            <action colspan="4"  name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks" width="510"/>
                    		</child1>
                         <child2>
                         <vpaned>
@@ -95,7 +115,7 @@
                         		<action colspan="4"  name="%(project.action_project_vs_remaining_hours_graph)d" string="Remaining Hours Per Project" />
                         	</child1>
                         	<child2>
-                        		<action colspan="4"  name="%(project.action_task_by_days_vs_planned_hours_graph)d" string="Planned Hours Per Day" />
+                        		<action colspan="4"  name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned Vs Total Hours" />
                         	</child2>
                         </vpaned>
                         </child2>
@@ -112,20 +132,19 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_project_form"/>
         </record>
-        
+
         <menuitem
             id="next_id_86"
             name="Dashboard"
-            icon="terp-graph"
             sequence="0"
             parent="base.menu_project_report"/>
-            
+
         <menuitem
             action="open_board_project"
             icon="terp-graph"
             id="menu_board_project"
             parent="next_id_86"
             sequence="1"/>
-            
+
     </data>
 </openerp>
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 3f998da3b0e..07b40f0158f 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -4,67 +4,67 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.10\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-19 09:19+0000\n"
-"Last-Translator: Rytis Ūsalis <Unknown>\n"
+"PO-Revision-Date: 2010-07-20 20:56+0000\n"
+"Last-Translator: Paulius Sladkevičius <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-06-22 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned tasks"
-msgstr ""
+msgstr "Priskirtos užduotys"
 
 #. module: project
 #: model:process.process,name:project.process_process_tasksprocess0
 msgid "Tasks Process"
-msgstr ""
+msgstr "Užduoties procesas"
 
 #. module: project
 #: help:project.task.delegate,init,name:0
 msgid "New title of the task delegated to the user."
-msgstr ""
+msgstr "Naujas užduoties, paskirtos naudotojui, pavadinimas."
 
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Change Remaining Hours"
-msgstr ""
+msgstr "Pakeisti likusias valandas"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_close_task
 msgid "Close Task"
-msgstr ""
+msgstr "Užbaigti užduotį"
 
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Projekto užduotys"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "Atvira užduotis"
 
 #. module: project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Netinkamas modelio pavadinimas veiksmo apibrėžime."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr ""
+msgstr "Nepatvirtintos valandos"
 
 #. module: project
 #: field:project.project,progress_rate:0
 msgid "Progress"
-msgstr ""
+msgstr "Eiga"
 
 #. module: project
 #: help:config.compute.remaining,remaining_hours:0
@@ -73,32 +73,33 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
+"Užduoties įgaliotinis gali periodiškai pertvarkyti visą likusį laiką."
 
 #. module: project
 #: field:project.project,child_id:0
 msgid "Subproject"
-msgstr ""
+msgstr "Subprojektas"
 
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "Projekto nariai"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr ""
+msgstr "Deleguotos užduotys"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_my_run
 #: model:ir.ui.menu,name:project.menu_open_view_my_project_my_run
 msgid "My Running Projects"
-msgstr ""
+msgstr "Mano vykdomi projektai"
 
 #. module: project
 #: field:project.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr ""
+msgstr "Perduoti užduotis"
 
 #. module: project
 #: help:project.project,warn_header:0
@@ -106,21 +107,23 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Kai klientui siunčiamas pranešimas, kad užduotis yra baigta, laiško "
+"pradžioje dedama antraštė."
 
 #. module: project
 #: field:project.task,priority:0
 msgid "Importance"
-msgstr ""
+msgstr "Svarbumas"
 
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Update"
-msgstr ""
+msgstr "Atnaujinti"
 
 #. module: project
 #: help:project.task.delegate,init,user_id:0
 msgid "User you want to delegate this task to."
-msgstr ""
+msgstr "Naudotojas, kuriam norite paskirti šią užduotį."
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_attachment_task
@@ -130,38 +133,38 @@ msgstr ""
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr ""
+msgstr "Sustabdyti"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr ""
+msgstr "Apibrėžkite reikalavimus ir planuojamas valanadas."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types
 msgid "Task Types"
-msgstr ""
+msgstr "Užduočių tipai"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr ""
+msgstr "Naujas projektas naudojantis šablonu"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr ""
+msgstr "Projektų užduotys"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very urgent"
-msgstr ""
+msgstr "Labai skubus"
 
 #. module: project
 #: wizard_button:project.task.delegate,init,valid:0
 msgid "Validate"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -175,23 +178,23 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
 msgid "My Tasks in Progress"
-msgstr ""
+msgstr "Mano užduočių atlikimas"
 
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "Nustatyti kaip šabloną"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "Juodraštinė užduotis"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
 #: field:project.task.work,task_id:0
 msgid "Task"
-msgstr ""
+msgstr "Užduotis"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours_me:0
@@ -199,9 +202,13 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task."
 msgstr ""
+"Numatomas Jūsų laikas patikrinti užbaigtą užduotį, kurią buvote delegavę "
+"kitam naudotojui."
 
 #. module: project
-#: view:project.project:0 field:project.project,notes:0 view:project.task:0
+#: view:project.project:0
+#: field:project.project,notes:0
+#: view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Pastabos"
@@ -209,7 +216,7 @@ msgstr "Pastabos"
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Days"
-msgstr ""
+msgstr "Dienos"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
@@ -217,7 +224,8 @@ msgid "Analysis"
 msgstr "Analizė"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project view:project.project:0
+#: model:ir.model,name:project.model_project_project
+#: view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -226,49 +234,53 @@ msgstr "Projektas"
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr ""
+msgstr "Pradėti užduotį"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_draft
 msgid "My Draft Tasks"
-msgstr ""
+msgstr "Mano užduočių juodraščiai"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
+"Automatiniai kintamieji antraštėse ir poraštėse. Naudokite lygiai tokią "
+"pačią struktūrą."
 
 #. module: project
-#: selection:project.project,state:0 selection:project.task,state:0
+#: selection:project.project,state:0
+#: selection:project.task,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Nutrauktas"
 
 #. module: project
-#: view:project.project:0 field:project.project,warn_header:0
+#: view:project.project:0
+#: field:project.project,warn_header:0
 msgid "Mail Header"
-msgstr ""
+msgstr "Laiško antraštė"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr ""
+msgstr "Atlikta užduotis"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr ""
+msgstr "Užduotis baigta"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr ""
+msgstr "Deleguoti užduotis kitiems naudotojams"
 
 #. module: project
 #: help:project.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Apskaičiuota bendra suma, gaunama sudėjus visas baigtas užduotis."
 
 #. module: project
 #: help:project.project,warn_customer:0
@@ -276,74 +288,78 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"Jeigu pažymėsite, uždarydamas užduoties langą naudotojas gaus pranešimą, "
+"siūlantį siųsti žinutę klientui."
 
 #. module: project
 #: help:project.task.delegate,init,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user."
-msgstr ""
+msgstr "Užduoties aprašymo įterpimas į naudotojo užduotį."
 
 #. module: project
 #: field:project.project,category_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitinė sąskaita"
 
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "Atliktas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
 #: model:ir.actions.act_window,name:project.action_view_task
 #: model:ir.ui.menu,name:project.menu_action_view_task
 msgid "All Tasks"
-msgstr ""
+msgstr "Visos užduotys"
 
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planavimas"
 
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Papildoma informacija"
 
 #. module: project
-#: field:project.project,partner_id:0 field:project.task,partner_id:0
+#: field:project.project,partner_id:0
+#: field:project.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partneris"
 
 #. module: project
 #: field:project.task,planned_hours:0
 #: wizard_field:project.task.delegate,init,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Planuojamos valandos"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr ""
+msgstr "Užduotis: %(name)s"
 
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr ""
+msgstr "Nustatyti iš naujo"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations"
-msgstr ""
+msgstr "Delegavimas"
 
 #. module: project
 #: help:project.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
 msgstr ""
+"Projekto nariai nėra įtraukiami į jokius skaičiavimus, reikalinga tik "
+"informacija apie juos."
 
 #. module: project
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project.act_my_project
+#: view:project.project:0
 msgid "My projects"
 msgstr "Mano projektai"
 
@@ -351,22 +367,23 @@ msgstr "Mano projektai"
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 msgid "All projects"
-msgstr ""
+msgstr "Visi projektai"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr ""
+msgstr "Nuo projekto būsenos, pereis į vykdomą būseną ."
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegated Task"
-msgstr ""
+msgstr "Deleguoti užduotį"
 
 #. module: project
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr ""
+"Uždarytų užduočių procentas, palyginti su visomis neatliktomis užduotimis."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,new_task_description:0
@@ -376,299 +393,310 @@ msgstr ""
 #. module: project
 #: help:project.project,notes:0
 msgid "Internal description of the project."
-msgstr ""
+msgstr "Vidinis projekto aprašymas."
 
 #. module: project
 #: field:project.project,parent_id:0
 msgid "Parent Project"
-msgstr ""
+msgstr "Tėvinis projektas"
 
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
+msgstr "Skaičiuojama taip : Praleistas + Likęs laikas."
 
 #. module: project
-#: field:project.task,type:0 field:project.task.type,name:0
+#: field:project.task,type:0
+#: field:project.task.type,name:0
 msgid "Type"
-msgstr ""
+msgstr "Tipas"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Weeks"
-msgstr ""
+msgstr "Savaitės"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog
 msgid "My Current Tasks"
-msgstr ""
+msgstr "Mano atviros užduotys"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project
 #: model:ir.ui.menu,name:project.menu_open_view_project
 msgid "New Project"
-msgstr ""
+msgstr "Naujas projektas"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "Vidutinis"
 
 #. module: project
 #: view:config.compute.remaining:0
 #: field:config.compute.remaining,remaining_hours:0
 #: field:project.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Likusios valandos"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 msgid "Project task type"
-msgstr ""
+msgstr "Projekto užduoties tipas"
 
 #. module: project
 #: field:project.project,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "Suplanuota"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work view:project.task:0
+#: model:ir.model,name:project.model_project_task_work
+#: view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
-msgstr ""
+msgstr "Užduoties darbas"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Hours"
-msgstr ""
+msgstr "Valandos"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
 #: model:ir.ui.menu,name:project.menu_tasks_yours_pending
 msgid "My Pending Tasks"
-msgstr ""
+msgstr "Mano laukiančios užduotys"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_opened
 #: model:ir.actions.act_window,name:project.action_view_task6_prog
 #: model:ir.ui.menu,name:project.menu_action_view_task6_prog
 msgid "Tasks in Progress"
-msgstr ""
+msgstr "Užduočių atlikimas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task7
 #: model:ir.ui.menu,name:project.menu_action_view_task7
 msgid "Unassigned Tasks"
-msgstr ""
+msgstr "Nepriskirtos užduotys"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "Delegavimo antraštė"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project
 #: model:ir.ui.menu,name:project.menu_open_view_my_project
 msgid "My Projects"
-msgstr ""
+msgstr "Mano projektai"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
 msgid "Estimated time to close this task by the delegated user."
-msgstr ""
+msgstr "Numatomas laikas, per kurį naudotojas turėtų baigti užduotį."
 
 #. module: project
 #: selection:project.project,state:0
 msgid "Template"
-msgstr ""
+msgstr "Šablonas"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions
+#: view:res.company:0
 msgid "Configuration"
 msgstr "Nustatymai"
 
 #. module: project
-#: field:project.project,date_start:0 field:project.task,date_start:0
+#: field:project.project,date_start:0
+#: field:project.task,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Pradžios data"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project
+#: view:project.project:0
 msgid "Projects"
-msgstr ""
+msgstr "Projektai"
 
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr ""
+msgstr "Datos"
 
 #. module: project
 #: field:project.task,history:0
 msgid "Task Details"
-msgstr ""
+msgstr "Užduoties detalės"
 
 #. module: project
 #: model:process.node,name:project.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Sąskaita faktūra"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr ""
+msgstr "Atidarytų užduočių juodraščiai"
 
 #. module: project
 #: view:project.project:0
 msgid "User: %(user_id)s"
-msgstr ""
+msgstr "Naudotojas:  %(user_id)s"
 
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Papildomos valandos"
 
 #. module: project
 #: field:project.project,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontaktai"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr ""
+msgstr "Deleguoti"
 
 #. module: project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Netinkamas XML peržiūros architektūrai!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main
+#: view:res.company:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projektų valdymas"
 
 #. module: project
-#: field:project.project,effective_hours:0 field:project.task.work,hours:0
+#: field:project.project,effective_hours:0
+#: field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Praleistas laikas"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks
+#: view:project.task:0
 msgid "Tasks"
-msgstr ""
+msgstr "Užduotys"
 
 #. module: project
 #: view:project.task.type:0
 msgid "Task type"
-msgstr ""
+msgstr "Užduoties tipas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_new
 #: model:ir.ui.menu,name:project.menu_action_view_task_new
 msgid "New Task"
-msgstr ""
+msgstr "Nauja užduotis"
 
 #. module: project
 #: help:project.project,timesheet_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Darbo valandos, reikalingos pakoreguoti gantt diagramos pranešimą"
 
 #. module: project
 #: view:project.project:0
 msgid "Project's members"
-msgstr ""
+msgstr "Projekto dalyviai"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Kai užduotis baigiama, sukuriama sąskaita faktūra."
 
 #. module: project
 #: help:project.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Skaičiuojama kaip: Praleistas laikas / Laikas iš viso."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task4
 #: model:ir.ui.menu,name:project.menu_action_view_task4
 msgid "My Tasks"
-msgstr ""
+msgstr "Mano užduotys"
 
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr ""
+msgstr "Būsena: %(state)s"
 
 #. module: project
 #: view:project.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Planuota"
 
 #. module: project
 #: help:project.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
+msgstr "Visos valandos, sugaištos užduotims, susijusioms su projektu."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr ""
+msgstr "Deleguoti užduotis"
 
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: project
 #: view:project.task:0
 msgid "Review"
-msgstr ""
+msgstr "Peržiūrėti"
 
 #. module: project
 #: view:project.project:0
 msgid "Administration"
-msgstr ""
+msgstr "Administravimas"
 
 #. module: project
 #: wizard_field:project.task.close,mail_ask,email:0
 msgid "E-Mails"
-msgstr ""
+msgstr "El. pašto adresai"
 
 #. module: project
 #: model:process.node,note:project.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Sukurtos sąskaitos faktūros iš pardavimo užsakymo eilučių."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0 selection:project.task,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Juodraštis"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Žemas"
 
 #. module: project
 #: field:project.project,manager:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Projekto vadovas"
 
 #. module: project
-#: view:project.project:0 selection:project.project,state:0
-#: view:project.task:0 selection:project.task,state:0
+#: view:project.project:0
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Laukianti"
 
 #. module: project
 #: field:project.task,state:0
 msgid "Status"
-msgstr ""
+msgstr "Būsena"
 
 #. module: project
 #: help:project.task.delegate,init,state:0
@@ -676,46 +704,49 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed."
 msgstr ""
+"Nauja Jūsų užduoties būsena.  Laukianti būsena bus atidaroma automatiškai, "
+"kai deleguota užduotis yra uždaroma."
 
 #. module: project
 #: field:res.company,project_time_mode:0
 msgid "Project Time Unit"
-msgstr ""
+msgstr "Projekto laiko vienetas"
 
 #. module: project
-#: field:project.project,complete_name:0 field:project.project,name:0
+#: field:project.project,complete_name:0
+#: field:project.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Projekto pavadinimas"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,mail_send:0
 msgid "Send Message"
-msgstr ""
+msgstr "Siųsti žinutę"
 
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Iš viso laiko"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktyvus"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_bug
 msgid "Bug"
-msgstr ""
+msgstr "Klaida"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_quote
 msgid "Quotation"
-msgstr ""
+msgstr "Juodraštis"
 
 #. module: project
 #: view:project.task:0
 msgid "Task edition"
-msgstr ""
+msgstr "Užduoties redagavimas"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -723,31 +754,34 @@ msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
 msgstr ""
+"Apskaičiuotas kaip:  Visas Laikas - Apskaičiuotas Laikas. Taip "
+"apskaičiuojamas laiko skirtumas tarp projekto vadybininko įvertinto ir "
+"tikslaus laiko, reikalingo užduočiai atlikti."
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr ""
+msgstr "Atverti užduotį"
 
 #. module: project
 #: field:project.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Darbo valandos"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Months"
-msgstr ""
+msgstr "Mėnesiai"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr ""
+msgstr "Kai užduotis atliekama, jos būsena tampa - atlikta."
 
 #. module: project
 #: field:project.task.work,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: project
 #: help:res.company,project_time_mode:0
@@ -756,41 +790,45 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
+"Leidžia nustatyti matavimo vienetą projektams ir užduotims.\n"
+" Jeigu Jūs naudojate darbo laiko žiniaraščius, susietus su šiais projektais "
+"(porject_timesheet modulis), nepamirškite nustatyti teisingą matavimo "
+"vienetą savo darbuotojams."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr ""
+msgstr "Naudotojo projektai"
 
 #. module: project
 #: view:project.project:0
 msgid "Reactivate Project"
-msgstr ""
+msgstr "Atnaujinti projektą"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Skubus"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegate this task to a user"
-msgstr ""
+msgstr "Deleguoti šią užduotį naudotojui"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Deleguotas"
 
 #. module: project
 #: field:project.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Pabaigos data"
 
 #. module: project
 #: field:project.task,user_id:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Priskirtas"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -798,11 +836,14 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
+"Numatomas laikas užduočiai atlikti (paprastai nustato projekto vadybininkas, "
+"kai užduotis yra projekto būsenoje)."
 
 #. module: project
 #: help:project.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
 msgstr ""
+"Visos valandos, praleistos užduotims, susijusioms su projektu, atlikti."
 
 #. module: project
 #: help:project.task,project_id:0
@@ -810,42 +851,46 @@ msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
 msgstr ""
+"Jeigu Jūs turite [?] pavadinime, tai reiškia, kad nėra analitinės sąskaitos "
+"susijusios su projektu."
 
 #. module: project
 #: help:project.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
 msgstr ""
+"Suplanuotos valandos, kurios reikalingos atlikti visas užduotis, susijusias "
+"su projektu."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
 msgid "Month works"
-msgstr ""
+msgstr "Mėnesio darbai"
 
 #. module: project
 #: model:ir.actions.report.xml,name:project.report_project_project_gantt
 #: model:ir.actions.report.xml,name:project.report_project_task_gantt
 msgid "Gantt Representation"
-msgstr ""
+msgstr "Užduočių grafikas"
 
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "Įspėti partnerį"
 
 #. module: project
 #: field:project.project,state:0
 msgid "State"
-msgstr ""
+msgstr "Būsena"
 
 #. module: project
 #: field:project.task,name:0
 msgid "Task summary"
-msgstr ""
+msgstr "Užduoties santrauka"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Start: %(date_start)s"
-msgstr ""
+msgstr "Pradžios data: %(date_start)s"
 
 #. module: project
 #: help:project.project,category_id:0
@@ -854,79 +899,86 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"Susiekite šį projektą su analitine sąskaita, jei Jums reikia projekto "
+"finansinio valdymo. Tai leidžia jums susieti projektą su biudžetu, "
+"planavimu, išlaidų ir pajamų analize, laiko žiniaraščiu ir t.t."
 
 #. module: project
-#: view:project.project:0 selection:project.project,state:0
-#: view:project.task:0 selection:project.task,state:0
+#: view:project.project:0
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
-msgstr ""
+msgstr "Atlikta"
 
 #. module: project
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0 view:project.task:0
+#: view:project.project:0
+#: view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_new
 msgid "Create a Task"
-msgstr ""
+msgstr "Sukurti užduotį"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 msgid "Open"
-msgstr ""
+msgstr "Veikianti"
 
 #. module: project
 #: view:project.project:0
 msgid "ID: %(task_id)s"
-msgstr ""
+msgstr "ID: %(task_id)s"
 
 #. module: project
 #: selection:project.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Vykdomas"
 
 #. module: project
 #: 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: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Atnaujinti"
 
 #. module: project
 #: field:project.task,parent_id:0
 msgid "Parent Task"
-msgstr ""
+msgstr "Tėvinė užduotis"
 
 #. module: project
 #: view:project.task:0
 msgid "Delay"
-msgstr ""
+msgstr "Atidėta"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "Labai žemas"
 
 #. module: project
 #: wizard_view:project.task.close,mail_ask:0
 msgid "Send mail to customer"
-msgstr ""
+msgstr "Siųsti klientui el. laišką"
 
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "Įspėti vadybininką"
 
 #. module: project
 #: model:ir.model,name:project.model_config_compute_remaining
@@ -936,50 +988,50 @@ msgstr ""
 #. module: project
 #: wizard_button:project.task.close,mail_ask,close:0
 msgid "Quiet close"
-msgstr ""
+msgstr "Tylus uždarymas"
 
 #. module: project
 #: help:project.task.delegate,init,prefix:0
 msgid "New title of your own task to validate the work done."
-msgstr ""
+msgstr "Nauja Jūsų užduoties antraštė leidžia pabaigti užduoties darbą."
 
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Progresas (%)"
 
 #. module: project
 #: field:project.task,description:0
 #: wizard_field:project.task.close,mail_ask,description:0
 #: field:project.task.type,description:0
 msgid "Description"
-msgstr ""
+msgstr "Aprašymas"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Užduoties sąskaita faktūra"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_my_project_open
 msgid "Projects Structure"
-msgstr ""
+msgstr "Projektų struktūra"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Validation Task"
-msgstr ""
+msgstr "Patvirtinta užduotis"
 
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr ""
+msgstr "Atlikti darbai"
 
 #. module: project
 #: selection:project.project,state:0
 msgid "Running"
-msgstr ""
+msgstr "Veikiantis"
 
 #. module: project
 #: help:project.project,parent_id:0
@@ -987,16 +1039,18 @@ msgid ""
 "If you have [?] in the name, it means there are no analytic account linked "
 "to project."
 msgstr ""
+"Jeigu Jūs turite [?] pavadinime, tai reiškia, kad nėra analitinės sąskaitos "
+"susijusios su projektu."
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_delegate_task
 msgid "Delegate Task"
-msgstr ""
+msgstr "Deleguoti užduotį"
 
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
-msgstr ""
+msgstr "Projekto užduotys"
 
 #. module: project
 #: help:project.project,warn_manager:0
@@ -1004,47 +1058,50 @@ msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
 msgstr ""
+"Jeigu Jūs pažymėsite šį laukelį, projekto vadybininkas gaus užklausą, "
+"kiekvieną kartą, kai jo komanda baigs užduotį."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
 msgid "New Feature"
-msgstr ""
+msgstr "Naujas ypatybė"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr ""
+msgstr "Registruoti savo darbo valandas."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,prefix:0
 msgid "Your Task Title"
-msgstr ""
+msgstr "Jūsų užduočių antraštė"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr ""
+msgstr "Projekto užduotis"
 
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "Sugaištos valandos"
 
 #. module: project
 #: field:project.task,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Iš viso valandų"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: model:ir.ui.menu,name:project.menu_template_project
 msgid "Template of Projects"
-msgstr ""
+msgstr "Projektų šablonai"
 
 #. module: project
-#: field:project.project,priority:0 field:project.task,sequence:0
+#: field:project.project,priority:0
+#: field:project.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seka"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1052,21 +1109,23 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Kai klientui siunčiamas pranešimas, kad užduotis yra baigta, laiško "
+"pradžioje dedama poraštė."
 
 #. module: project
 #: view:project.project:0
 msgid "Partner Info"
-msgstr ""
+msgstr "Partnerio informacija"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_config_compute_remaining
 msgid "Compute Remaining Hours"
-msgstr ""
+msgstr "Skaičiuoti likusias valandas"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,state:0
 msgid "Validation State"
-msgstr ""
+msgstr "Patvirtinimo būsena"
 
 #. module: project
 #: constraint:project.project:0
@@ -1076,43 +1135,44 @@ msgstr ""
 #. module: project
 #: field:project.task,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Galutinis terminas"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Priskirti kam"
 
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr ""
+msgstr "Darbo santrauka"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date_stop)s"
-msgstr ""
+msgstr "Pabaigos data: %(date_stop)s"
 
 #. module: project
 #: field:project.project,date_end:0
 msgid "Expected End"
-msgstr ""
+msgstr "Pabaigos data"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr ""
+msgstr "Deleguoti savo užduotį kitam naudotojui"
 
 #. module: project
-#: view:project.project:0 field:project.project,warn_footer:0
+#: view:project.project:0
+#: field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr ""
+msgstr "Laiško poraštė"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
-msgstr ""
+msgstr "Vykdomi projektai"
 
 #. module: project
 #: view:board.board:0
@@ -1209,3 +1269,214 @@ msgstr ""
 #: view:board.board:0
 msgid "My Timesheet"
 msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't send mail because the contact for this task (%s) has no email "
+#~ "address!"
+#~ msgstr ""
+#~ "Negalima išsiųsti elektroninio laiško, kadangi šios užduoties (%s) nurodytas "
+#~ "kontaktas neturi elektroninio pašto adreso!"
+
+#, python-format
+#~ msgid "Operation Not Permitted !"
+#~ msgstr "Veiksmas neleidžiamas!"
+
+#, python-format
+#~ msgid "Operation Done"
+#~ msgstr "Operacija atlikta"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Klaida"
+
+#, python-format
+#~ msgid "Couldn't send mail because your email address is not configured!"
+#~ msgstr ""
+#~ "Negalima išsiųsti laiško, kadangi nesukonfigūruotas elektronio pašto adresas!"
+
+#, python-format
+#~ msgid ""
+#~ "You can not delete a project with tasks. I suggest you to deactivate it."
+#~ msgstr ""
+#~ "Jūs negalite ištrinti projekto su užduotimis. Mes rekomenduojame ištrinti "
+#~ "jas."
diff --git a/addons/project/project.py b/addons/project/project.py
index 5ed5f9641ab..603154d28fe 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -21,6 +21,7 @@
 
 from lxml import etree
 import time
+from datetime import date, datetime
 
 from tools.translate import _
 from osv import fields, osv
@@ -38,21 +39,21 @@ class project_task_type(osv.osv):
     _defaults = {
         'sequence': 1
     }
-    
+
 project_task_type()
 
 class project(osv.osv):
     _name = "project.project"
     _description = "Project"
-    _inherits = {'account.analytic.account':"category_id"}
+    _inherits = {'account.analytic.account': "analytic_account_id"}
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         if user == 1:
             return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order, context=context, count=count)
         if context and context.has_key('user_prefence') and context['user_prefence']:
                 cr.execute("""SELECT project.id FROM project_project project
-                           LEFT JOIN account_analytic_account account ON account.id = project.category_id
-                           LEFT JOIN project_user_rel rel ON rel.project_id = project.category_id
+                           LEFT JOIN account_analytic_account account ON account.id = project.analytic_account_id
+                           LEFT JOIN project_user_rel rel ON rel.project_id = project.analytic_account_id
                            WHERE (account.user_id = %s or rel.uid = %s)"""%(user, user))
                 res = cr.fetchall()
                 return [(r[0]) for r in res]
@@ -78,36 +79,64 @@ class project(osv.osv):
         pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
         return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}}
 
+    def get_all_child_projects(self, cr, uid, ids, context=None):
+        cr.execute('''select prpc.id as id from account_analytic_account as p
+join account_analytic_account as c  on p.id = c.parent_id
+join project_project as prp on prp.analytic_account_id = p.id
+join project_project as prpc on prpc.analytic_account_id = c.id
+where prp.id in %s''',(tuple(ids),))
+
+        child_ids = cr.fetchall()
+        if child_ids:
+          child_ids = [x[0] for x in child_ids]
+          child_ids = self.get_all_child_projects(cr, uid, child_ids)
+
+        return ids+child_ids
+
     def _progress_rate(self, cr, uid, ids, names, arg, context=None):
         res = {}.fromkeys(ids, 0.0)
         progress = {}
         if not ids:
             return res
-        ids2 = self.search(cr, uid, [('parent_id','child_of',ids)], context=context)
-        if ids2:
-            cr.execute('''SELECT
-                    project_id, sum(planned_hours), sum(total_hours), sum(effective_hours)
-                FROM
-                    project_task
-                WHERE
-                    project_id IN %s AND
-                    state<>'cancelled'
-                GROUP BY
-                    project_id''',(tuple(ids2),))
-            progress = dict(map(lambda x: (x[0], (x[1], x[2], x[3])), cr.fetchall()))
-        for project in self.browse(cr, uid, ids, context=context):
+
+        par_child_projects={}
+        all_projects = list(ids)
+
+        for id in ids:
+            child_projects = self.get_all_child_projects(cr, uid, [id], context)
+            child_projects = [x for x in child_projects]
+            par_child_projects[id] = child_projects
+            all_projects.extend(child_projects)
+
+        all_projects = dict.fromkeys(all_projects).keys()
+        cr.execute('''SELECT
+                project_id, sum(planned_hours), sum(total_hours), sum(effective_hours)
+            FROM
+                project_task
+            WHERE
+                project_id IN %s AND
+                state<>'cancelled'
+            GROUP BY
+                project_id''',(tuple(all_projects),))
+        progress = dict(map(lambda x: (x[0], (x[1], x[2], x[3])), cr.fetchall()))
+
+        for project in self.browse(cr, uid, par_child_projects.keys(), context=context):
             s = [0.0, 0.0, 0.0]
-            tocompute = [project]
+            tocompute = par_child_projects[project.id]
             while tocompute:
                 p = tocompute.pop()
-                tocompute += p.child_ids
                 for i in range(3):
-                    s[i] += progress.get(p.id, (0.0, 0.0, 0.0))[i]
+                    s[i] += progress.get(p, (0.0, 0.0, 0.0))[i]
+            if project.state == 'close':
+                progress_rate = 100.0
+            else:
+                progress_rate = s[1] and round(min(100.0 * s[2] / s[1], 99.99), 2)
+
             res[project.id] = {
                 'planned_hours': s[0],
                 'effective_hours': s[2],
                 'total_hours': s[1],
-                'progress_rate': s[1] and (100.0 * s[2] / s[1]) or 0.0
+                'progress_rate': progress_rate
             }
         return res
 
@@ -121,31 +150,30 @@ class project(osv.osv):
         'complete_name': fields.function(_complete_name, method=True, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the project without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
-        'category_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying a list of task"),
-        'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team."),
-        'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose."),
+        'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
-        'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project."),
-        'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project."),
-        'total_hours': fields.function(_progress_rate, multi="progress", method=True, string='Total Time', help="Sum of total hours of all tasks related to this project."),
+        'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects."),
+        'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects."),
+        'total_hours': fields.function(_progress_rate, multi="progress", method=True, string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects."),
         'progress_rate': fields.function(_progress_rate, multi="progress", method=True, string='Progress', type='float', help="Percent of tasks closed according to the total of tasks todo."),
-        'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer."),
-        'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed."),
-        'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."),
-        'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages'),
-        'project_escalation_id': fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.'),
+        'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
      }
-    
+
     _order = "sequence"
-    
+
     _defaults = {
         'active': True,
         'priority': 1,
         'sequence': 10,
         'warn_manager': True,
     }
-    
+
     def _check_dates(self, cr, uid, ids):
          leave = self.read(cr, uid, ids[0], ['date_start', 'date'])
          if leave['date_start'] and leave['date']:
@@ -153,23 +181,18 @@ class project(osv.osv):
                  return False
          return True
 
-    def _check_escalation(self, cr, uid, ids):
-         project_obj = self.browse(cr, uid, ids[0])
-         if project_obj.project_escalation_id:
-             if project_obj.project_escalation_id.id == project_obj.id:
-                 return False
-         return True
-
     _constraints = [
-        (_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date']),
-        (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id'])
+        (_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date'])
     ]
-    
+
     def set_template(self, cr, uid, ids, context=None):
         res = self.setActive(cr, uid, ids, value=False, context=context)
         return res
 
     def set_done(self, cr, uid, ids, context=None):
+        task_obj = self.pool.get('project.task')
+        task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('state', 'not in', ('cancelled', 'done'))])
+        task_obj.write(cr, uid, task_ids, {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
         self.write(cr, uid, ids, {'state':'close'}, context=context)
         for (id, name) in self.name_get(cr, uid, ids):
             message = _('Project ') + " '" + name + "' "+ _("is Closed.")
@@ -177,6 +200,9 @@ class project(osv.osv):
         return True
 
     def set_cancel(self, cr, uid, ids, context=None):
+        task_obj = self.pool.get('project.task')
+        task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('state', '!=', 'done')])
+        task_obj.write(cr, uid, task_ids, {'state': 'cancelled', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
         self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
         return True
 
@@ -198,6 +224,8 @@ class project(osv.osv):
     def copy(self, cr, uid, id, default={}, context=None):
         if context is None:
             context = {}
+
+        task_obj = self.pool.get('project.task')
         proj = self.browse(cr, uid, id, context=context)
         default = default or {}
         context['active_test'] = False
@@ -205,9 +233,24 @@ class project(osv.osv):
         if not default.get('name', False):
             default['name'] = proj.name+_(' (copy)')
         res = super(project, self).copy(cr, uid, id, default, context)
+
+        task_ids = task_obj.search(cr, uid, [('project_id','=', res), ('active','=',False)])
+        tasks = task_obj.browse(cr, uid, task_ids)
+        for task in tasks:
+            date_deadline = None
+            date_end = None
+            if task.date_start:
+                ds = date(*time.strptime(task.date_start,'%Y-%m-%d %H:%M:%S')[:3])
+                if task.date_deadline:
+                    dd = date(*time.strptime(task.date_deadline,'%Y-%m-%d')[:3])
+                    diff = dd-ds
+                    date_deadline = (datetime.now()+diff).strftime('%Y-%m-%d %H:%M:%S')
+            task_obj.write(cr, uid, task.id, {'active':True,
+                                              'date_start':time.strftime('%Y-%m-%d %H:%M:%S'),
+                                              'date_deadline':date_deadline,
+                                              'date_end':date_end})
+
         ids = self.search(cr, uid, [('parent_id','child_of', [res])])
-        if ids:
-            cr.execute('update project_task set active=True where project_id IN %s',(tuple(ids),))
         return res
 
     def duplicate_template(self, cr, uid, ids, context=None):
@@ -227,8 +270,8 @@ class project(osv.osv):
             result.append(new_id)
             cr.execute('select id from project_task where project_id=%s', (proj.id,))
             res = cr.fetchall()
-            child_ids = self.search(cr, uid, [('parent_id','=', proj.category_id.id)], context=context)
-            parent_id = self.read(cr, uid, new_id, ['category_id'])['category_id'][0]
+            child_ids = self.search(cr, uid, [('parent_id','=', proj.analytic_account_id.id)], context=context)
+            parent_id = self.read(cr, uid, new_id, ['analytic_account_id'])['analytic_account_id'][0]
             if child_ids:
                 self.duplicate_template(cr, uid, child_ids, context={'parent_id': parent_id})
 
@@ -262,11 +305,11 @@ class project(osv.osv):
             tasks_id = [x[0] for x in cr.fetchall()]
             if tasks_id:
                 task_obj.write(cr, uid, tasks_id, {'active': value}, context=context)
-            child_ids = self.search(cr, uid, [('parent_id','=', proj.id)])
+            child_ids = self.search(cr, uid, [('parent_id','=', proj.analytic_account_id.id)])
             if child_ids:
                 self.setActive(cr, uid, child_ids, value, context=None)
         return True
-    
+
 project()
 
 class task(osv.osv):
@@ -314,6 +357,7 @@ class task(osv.osv):
     def copy_data(self, cr, uid, id, default={}, context=None):
         default = default or {}
         default['work_ids'] = []
+        default['active'] = True
         return super(task, self).copy_data(cr, uid, id, default, context)
 
     def _check_dates(self, cr, uid, ids, context=None):
@@ -323,16 +367,26 @@ class task(osv.osv):
                  return False
         return True
 
+    def _is_template(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for task in self.browse(cr, uid, ids, context=context):
+            res[task.id] = True
+            if task.project_id:
+                if task.project_id.active == False or task.project_id.state == 'template':
+                    res[task.id] = False
+        return res
+
     _columns = {
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the task without removing it."),
+        'active': fields.function(_is_template, method=True, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', size=128, required=True),
         'description': fields.text('Description'),
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
-        'type': fields.many2one('project.task.type', 'Stage',),
+        'type_id': fields.many2one('project.task.type', 'Stage',),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
+        'create_date': fields.datetime('Create Date', readonly=True),
         'date_start': fields.datetime('Starting Date'),
         'date_end': fields.datetime('Ending Date'),
         'date_deadline': fields.date('Deadline'),
@@ -352,21 +406,20 @@ class task(osv.osv):
         'delegated_user_id': fields.related('child_ids', 'user_id', type='many2one', relation='res.users', string='Delegated To'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
-        'manager_id': fields.related('project_id', 'category_id', 'user_id', type='many2one', relation='res.users', string='Project Manager'),
+        'manager_id': fields.related('project_id', 'analytic_account_id', 'user_id', type='many2one', relation='res.users', string='Project Manager'),
         'company_id': fields.many2one('res.company', 'Company'),
     }
-    
+
     _defaults = {
         'state': 'draft',
         'priority': '2',
         'progress': 0,
         'sequence': 10,
         'active': True,
-        'date_start': time.strftime('%Y-%m-%d %H:%M:%S'),
         'project_id': _default_project,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c)
     }
-    
+
     _order = "sequence, priority, date_start, id"
 
     _constraints = [
@@ -375,7 +428,7 @@ class task(osv.osv):
     #
     # Override view according to the company definition
     #
-    
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         users_obj = self.pool.get('res.users')
         obj_tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
@@ -427,11 +480,12 @@ class task(osv.osv):
                         'ref_doc1': 'project.task,%d'% (task.id,),
                         'ref_doc2': 'project.project,%d'% (project.id,),
                     })
-                elif project.warn_manager and cntx.get('mail_send',False):
+                elif (project.warn_manager or project.warn_customer) and cntx.get('mail_send',True):
+                    cntx.update({'send_manager': project.warn_manager, 'send_partner': project.warn_customer})
                     mail_send = True
             message = _('Task ') + " '" + task.name + "' "+ _("is Done.")
             self.log(cr, uid, task.id, message)
-            self.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
+
             for parent_id in task.parent_ids:
                 if parent_id.state in ('pending','draft'):
                     reopen = True
@@ -501,7 +555,7 @@ class task(osv.osv):
     def do_open(self, cr, uid, ids, *args):
         tasks= self.browse(cr,uid,ids)
         for t in tasks:
-            self.write(cr, uid, [t.id], {'state': 'open'})
+            self.write(cr, uid, [t.id], {'state': 'open',  'date_start': time.strftime('%Y-%m-%d %H:%M:%S'),})
             message = _('Task ') + " '" + t.name + "' "+ _("is Open.")
             self.log(cr, uid, t.id, message)
         return True
@@ -519,25 +573,25 @@ class task(osv.osv):
         return True
 
     def next_type(self, cr, uid, ids, *args):
-        for typ in self.browse(cr, uid, ids):
-            typeid = typ.type.id
-            types = map(lambda x:x.id, typ.project_id.type_ids or [])
+        for task in self.browse(cr, uid, ids):
+            typeid = task.type_id.id
+            types = map(lambda x:x.id, task.project_id.type_ids or [])
             if types:
                 if not typeid:
-                    self.write(cr, uid, typ.id, {'type': types[0]})
+                    self.write(cr, uid, task.id, {'type_id': types[0]})
                 elif typeid and typeid in types and types.index(typeid) != len(types)-1 :
                     index = types.index(typeid)
-                    self.write(cr, uid, typ.id, {'type': types[index+1]})
+                    self.write(cr, uid, task.id, {'type_id': types[index+1]})
         return True
 
     def prev_type(self, cr, uid, ids, *args):
-        for typ in self.browse(cr, uid, ids):
-            typeid = typ.type.id
-            types = map(lambda x:x.id, typ.project_id.type_ids)
+        for task in self.browse(cr, uid, ids):
+            typeid = task.type_id.id
+            types = map(lambda x:x.id, task.project_id.type_ids)
             if types:
                 if typeid and typeid in types:
                     index = types.index(typeid)
-                    self.write(cr, uid, typ.id, {'type': index and types[index-1] or False})
+                    self.write(cr, uid, task.id, {'type_id': index and types[index-1] or False})
         return True
 
 task()
@@ -553,14 +607,14 @@ class project_work(osv.osv):
         'user_id': fields.many2one('res.users', 'Done by', required=True),
         'company_id': fields.related('task_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True)
     }
-    
+
     _defaults = {
         'user_id': lambda obj, cr, uid, context: uid,
         'date': time.strftime('%Y-%m-%d %H:%M:%S')
     }
-    
+
     _order = "date desc"
-    
+
     def create(self, cr, uid, vals, *args, **kwargs):
         if 'hours' in vals and (not vals['hours']):
             vals['hours'] = 0.00
@@ -582,12 +636,12 @@ class project_work(osv.osv):
         for work in self.browse(cr, uid, ids):
             cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (work.hours, work.task_id.id))
         return super(project_work,self).unlink(cr, uid, ids, *args, **kwargs)
-    
+
 project_work()
 
 class config_compute_remaining(osv.osv_memory):
     _name='config.compute.remaining'
-    
+
     def _get_remaining(self,cr, uid, ctx):
         task_obj = self.pool.get('project.task')
         if 'active_id' in ctx:
@@ -598,6 +652,15 @@ class config_compute_remaining(osv.osv_memory):
         'remaining_hours' : fields.float('Remaining Hours', digits=(16,2), help="Put here the remaining hours required to close the task."),
     }
 
+    def _get_analytic_account(self, cr, uid, context={}):
+        if context.get('account_id', False):
+            return context.get('account_id')
+        return False
+
+    _defaults = {
+              'account_id' : _get_analytic_account,
+              }
+
     _defaults = {
         'remaining_hours': _get_remaining
     }
@@ -634,7 +697,7 @@ config_compute_remaining()
 class message(osv.osv):
     _name = "project.message"
     _description = "Message"
-    
+
     _columns = {
         'subject': fields.char('Subject', size=128, required="True"),
         'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
@@ -664,7 +727,7 @@ class users(osv.osv):
     _columns = {
         'context_project_id': fields.many2one('project.project', 'Project')
      }
-    
+
 users()
 
 class account_analytic_account(osv.osv):
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 7c5b40f3ddf..dd6708337e8 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -14,6 +14,15 @@
             <field name="name">Project task</field>
             <field name="object">project.task</field>
         </record>
-
+        
+              <!--
+	Resource: project.project
+	-->
+        <record id="all_projects_account" model="account.analytic.account">
+            <field name="name">Projects</field>
+            <field name="code">3</field>
+        </record>
+	
+		<function eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)" id="parent_project_default_set" model="ir.values" name="set"/>
     </data>
 </openerp>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 43f01c2120d..0ce0e37a327 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -31,7 +31,8 @@
         <record id="project_project_9" model="project.project">
             <field name="warn_manager">1</field>
             <field name="name">Open ERP Integration</field>
-            <field name="manager" ref="base.user_root"/>
+            <field name="parent_id" ref="all_projects_account"/>
+            <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge')])]" name="type_ids"/>
         </record>
         <record id="project_project_21" model="project.project">
@@ -39,21 +40,20 @@
             <field name="priority">10</field>
             <field name="parent_id" ref="project_project_9"/>
             <field name="name">Study + Prototype</field>
-            <field name="manager" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development')])]" name="type_ids"/>
         </record>
         <record id="project_project_22" model="project.project">
             <field name="priority">20</field>
             <field name="parent_id" ref="project_project_9"/>
             <field name="name">Specific Developments</field>
-            <field name="manager" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('project_tt_specification'), ref('project_tt_development')])]" name="type_ids"/>
         </record>
         <record id="project_project_23" model="project.project">
             <field name="priority">30</field>
             <field name="parent_id" ref="project_project_9"/>
             <field name="name">Install, data import, configuration</field>
-            <field name="manager" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('project_tt_development')])]" name="type_ids"/>
         </record>
 
@@ -100,7 +100,6 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Internal testing + Software Install</field>
-            <field name="date_deadline">2008-06-06</field>
         </record>
         <record id="project_task_188" model="project.task">
             <field name="sequence">17</field>
@@ -214,7 +213,6 @@
             <field name="project_id" ref="project_project_23"/>
             <field name="state">open</field>
             <field name="name">In house training</field>
-            <field name="date_deadline">2007-06-06</field>
         </record>
         <record id="project_task_202" model="project.task">
             <field name="sequence">50</field>
@@ -257,7 +255,6 @@
             <field name="name">Latest in house tests</field>
         </record>
         <record id="project_message_1" model="project.message">
-			<field name="date">2010-05-27</field>
 			<field name="project_id" ref="project.project_project_23"/>
 			<field name="user_id" ref="base.user_root"/>
 			<field name="description">Follow the procedure of Configuration wizard.
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index c989ab50aab..320b3302241 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -1,6 +1,6 @@
 <openerp>
   <data>
-  
+
     <record id="view_project_installer" model="ir.ui.view">
       <field name="name">project.installer.view</field>
       <field name="model">project.installer</field>
@@ -9,7 +9,7 @@
       <field name="arch" type="xml">
       	<data>
           <form position="attributes">
-            <attribute name="string">Project Modules Installation</attribute>
+            <attribute name="string">Project Modules Configuration</attribute>
           </form>
           <separator string="title" position="attributes">
             <attribute name="string">Project Management</attribute>
@@ -18,7 +18,7 @@
           	  <attribute name='string'></attribute>
      		</xpath>
           <xpath expr="//label[@string='description']" position="attributes">
-          	<attribute name="string">Various OpenERP applications are available to bring your project management to the next levels of control and flexibility.</attribute>
+          	<attribute name="string">Various OpenERP applications are available to manage your projects with different level of control and flexibility.</attribute>
           </xpath>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
           	<attribute name="string">Configure</attribute>
@@ -65,6 +65,6 @@
   				</xpath>
   			</field>
 	</record>
-	
+
   </data>
 </openerp>
diff --git a/addons/project/project_resource.py b/addons/project/project_resource.py
deleted file mode 100644
index 1295ea9e64a..00000000000
--- a/addons/project/project_resource.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 pooler
-import datetime
-
-def timeformat_convert(cr, uid, time_string):
-#    Function to convert input time string:: 8.5 to output time string 8:30
-        split_list = str(time_string).split('.')
-        hour_part = split_list[0]
-        mins_part = split_list[1]
-        round_mins  = int(round(float(mins_part) * 60,-2))
-        converted_string = hour_part + ':' + str(round_mins)[0:2]
-        return converted_string
-
-def leaves_resource(cr, uid, calendar_id, resource_id=False, resource_calendar=False):
-#    To get the leaves for the resource_ids working on phase
-
-        pool = pooler.get_pool(cr.dbname)
-        resource_leaves_pool = pool.get('resource.calendar.leaves')
-        leaves = []
-        if resource_id:
-            resource_leave_ids = resource_leaves_pool.search(cr, uid, ['|',('calendar_id','=',calendar_id),('calendar_id','=',resource_calendar),('resource_id','=',resource_id)])
-        else:
-            resource_leave_ids = resource_leaves_pool.search(cr, uid, [('calendar_id','=',calendar_id),('resource_id','=',False)])
-        res_leaves = resource_leaves_pool.read(cr, uid, resource_leave_ids, ['date_from','date_to'])
-        for leave in range(len(res_leaves)):
-                dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
-                dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
-                no = dt_end - dt_start
-                [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
-                leaves.sort()
-        return leaves
-
-def compute_working_calendar(cr, uid, calendar_id):
-#     To change the format of working calendar to bring it into 'faces' format
-
-        pool = pooler.get_pool(cr.dbname)
-        resource_week_pool = pool.get('resource.calendar.week')
-        time_range = "8:00-8:00"
-        non_working = ""
-        wk = {"0":"mon", "1":"tue", "2":"wed", "3":"thu", "4":"fri", "5":"sat", "6":"sun"}
-        wk_days = {}
-        wk_time = {}
-        wktime_list = []
-        wktime_cal = []
-        week_ids = resource_week_pool.search(cr, uid, [('calendar_id','=',calendar_id)])
-        week_obj = resource_week_pool.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'])
-
-#     Converting time formats into appropriate format required
-#     and creating a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
-        for week in week_obj:
-            res_str = ""
-            if wk.has_key(week['dayofweek']):
-                day = wk[week['dayofweek']]
-                wk_days[week['dayofweek']] = wk[week['dayofweek']]
-
-            hour_from_str = timeformat_convert(cr, uid, week['hour_from'])
-            hour_to_str = timeformat_convert(cr, uid, week['hour_to'])
-            res_str = hour_from_str + '-' + hour_to_str
-            wktime_list.append((day,res_str))
-
-#     Converting it to format like [('mon', '8:00-12:00', '13:00-18:00')]
-        for item in wktime_list:
-            if wk_time.has_key(item[0]):
-                wk_time[item[0]].append(item[1])
-            else:
-                wk_time[item[0]] = [item[0]]
-                wk_time[item[0]].append(item[1])
-
-        for k,v in wk_time.items():
-            wktime_cal.append(tuple(v))
-
-#     For non working days adding [('tue,wed,fri,sat,sun', '8:00-8:00')]
-        for k,v in wk_days.items():
-            if wk.has_key(k):
-                wk.pop(k)
-        for v in wk.itervalues():
-            non_working += v + ','
-        if non_working:
-            wktime_cal.append((non_working[:-1],time_range))
-
-        return wktime_cal
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0c9b2f671ce..166e64217ac 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,9 +20,9 @@
                     <group colspan="6" col="6">
                         <field name="name" string="Project Name" select="1"/>
                         <field name="parent_id" string="Parent Project"/>
-                        <field name="user_id" string="Project Manager" select="1"/>
-                        <field name="date_start"/>
-                        <field name="date"/>
+                        <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                        <field name="date_start" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                        <field name="date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="progress_rate" widget="progressbar"/>
                     </group>
                     <notebook colspan="4">
@@ -40,17 +40,16 @@
                             <group col="2" colspan="2" name="misc">
                                 <separator colspan="2" string="Miscelleanous"/>
                                 <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                                <field name="project_escalation_id"/>
                                 <field name="warn_manager"/>
                             </group>
                             <newline/>
                             <group col="9" colspan="8">
-                                <field name="state" select="1"/>
+                                <field name="state" select="1" readonly="1"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
-                                <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,done" icon="gtk-ok"/>
+                                <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
                                 <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                                <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-jump-to"/>
+                                <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
                                 <button
                                     string="New Project Based on Template"
@@ -117,7 +116,6 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-document-new" string="Draft" domain="[('state', 'in',('draft',))]" help="Draft Projects" default="1"/>
                        <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects" default="1"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-personal" string="Manager" name="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
@@ -132,7 +130,7 @@
                     	<filter string="Parent" name="Parent"  icon="terp-personal" domain = "[]" context="{'group_by':'parent_id'}"/>
                         <filter string="Users" name="Users"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner"  icon="terp-personal" domain = "[]" context="{'group_by':'partner_id'}"/>
-                      </group>
+                    </group>
                </search>
             </field>
         </record>
@@ -167,6 +165,7 @@
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{'search_default_Current':1}</field>
+            <field name="help">Consult and define your projects here. A project contains a set of related activities that will be performed by your company. Any project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure very useful for work organization.</field>
         </record>
         <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
 
@@ -246,10 +245,10 @@
                 <form string="Task edition">
                     <group colspan="6" col="6">
                         <field name="name" select="1"/>
-                        <field name="project_id" required="1" select="1" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
+                        <field name="project_id" required="1" select="1" domain="[('user_id','=',uid)]"/>
                         <field name="total_hours" widget="float_time"/>
-                        <field name="date_deadline"/>
-                        <field name="user_id" select="1"/>
+                        <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                        <field name="user_id" select="1" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                         <field name="progress" widget="progressbar"/>
                     </group>
                     <notebook colspan="4">
@@ -317,16 +316,16 @@
                                 <separator string="Dates" colspan="2"/>
                                 <field name="date_start"/>
                                 <field name="date_end"/>
+                                <field name="create_date"/>
                             </group>
                             <separator string="Miscelleanous" colspan="4"/>
                             <field name="partner_id"/>
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <group col="4" colspan="2">
-                                <field name="type" widget="selection" />
+                                <field name="type_id" widget="selection" readonly="1"/>
                                 <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                                 <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                             </group>
-                            <field name="active"/>
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
@@ -342,18 +341,13 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
-                    <field name="sequence" />
+                    <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                     <field name="user_id"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
-                    <field name="planned_hours" widget="float_time" />
-                    <field name="total_hours" widget="float_time"/>
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
-                    <field name="type" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
-                    <field name="date_start" invisible="1"/>
-                    <field name="date_end" invisible="1"/>
                     <button name="next_type" invisible="context.get('set_visible',False)"
                         states="draft,open,pending"
                         string="Change Stage"
@@ -361,6 +355,9 @@
                         icon="gtk-go-forward"
                         groups="base.group_extended"
                         help="Change Type"/>
+                    <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
+                    <field name="date_start" invisible="1"/>
+                    <field name="date_end" invisible="1"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
@@ -418,25 +415,34 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-check" default="1"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft, Open and Pending Tasks" icon="terp-check" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
+						<filter name="edit"  
+	                        string="Edit" context="{'set_editable':True,'seq_visible': True}"
+	                        icon="gtk-execute"
+	                        groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <filter string="Deadlines" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                        <filter name="template" domain="[('active', '=', False)]"
+	                        string="Template"
+	                        icon="terp-project"
+	                        groups="base.group_extended"
+	                        help="Change Type"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="project_id" select="1">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
                         </field>
                         <field name="user_id" select="1">
-                            <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
+                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
@@ -454,9 +460,12 @@
             <field name="view_mode">tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" ref="view_task_tree2"/>
-            <field name="context">{"search_default_project_id":project_id,'search_default_user_id':uid, 'search_default_current': 1}</field>
+            <field name="context">{"search_default_project_id":project_id, "search_default_user_id":uid, 'search_default_current': 1}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
+            <field name="help">In OpenERP, a project is made of a set of activities (or tasks) for completion.A list view allows the manager to quickly check for task status and make it evolve, delegate task, etc. A search tool allows a multi-criteria sort of activities.
 
+Issues like bugs in a system, client complain, materials breakdown are collected here.A list view allows the manager to quickly check for them, assign them, make their status evolved.
+</field>
         </record>
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="2"/>
 
@@ -497,7 +506,8 @@
                 <form string="Task Stage">
                     <field name="name" select="1"/>
                     <field name="sequence"/>
-                    <field colspan="4" name="description"/>
+                    <separator string="Description" colspan="4"/>
+                    <field colspan="4" name="description" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -515,7 +525,7 @@
         </record>
 
         <record id="open_task_type_form" model="ir.actions.act_window">
-            <field name="name">Types</field>
+            <field name="name">Task Stages</field>
             <field name="res_model">project.task.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="task_type_tree"/>
@@ -571,7 +581,7 @@
          <field eval="18" name="priority"/>
          <field name="arch" type="xml">
             <page string="Current Activity" position="inside">
-                <field name="context_project_id" completion="1" context="{'user_prefence':True}" widget="selection"/>
+                <field name="context_project_id" completion="1" context="{'user_prefence':True}" widget="selection" readonly="0"/>
             </page>
        </field>
     </record>
@@ -641,6 +651,7 @@
             <field name="view_id" ref="view_project_message_tree"/>
             <field name="context">{"search_default_project_id":project_id, "search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_project_message_search"/>
+            <field name="help">An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis.</field>
        </record>
 
         <menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_project_management" sequence="11"/>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index a3ecf0f4ba1..bd1d12b7637 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -83,7 +83,7 @@ class report_project_task_user(osv.osv):
                     t.name as name,
                     t.company_id,
                     t.partner_id,
-                    t.type,
+                    t.type_id,
                     remaining_hours as remaining_hours,
                     total_hours as total_hours,
                     t.delay_hours as hours_delay,
@@ -115,38 +115,42 @@ class report_project_task_user(osv.osv):
                     name,
                     t.company_id,
                     t.partner_id,
-                    t.type
+                    t.type_id
 
         """)
 
 report_project_task_user()
 
 #This class is generated for project deshboard purpose
-class project_vs_remaining_hours(osv.osv):
-    _name = "project.vs.remaining.hours"
-    _description = " Project vs Remaining hours"
+class project_vs_hours(osv.osv):
+    _name = "project.vs.hours"
+    _description = " Project vs  hours"
     _auto = False
     _columns = {
         'project': fields.char('Project', size=128, required=True),
         'remaining_hours': fields.float('Remaining Hours', readonly=True),
+        'planned_hours': fields.float('Planned Hours', readonly=True),
+        'total_hours': fields.float('Total Hours', readonly=True),
         'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True, readonly=True)
     }
     _order = 'project desc'
 
     def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'project_vs_remaining_hours')
+        tools.sql.drop_view_if_exists(cr, 'project_vs_hours')
         cr.execute("""
-            CREATE or REPLACE view project_vs_remaining_hours as (
+            CREATE or REPLACE view project_vs_hours as (
                 select
                       min(pt.id) as id,
                       aaa.user_id as uid,
                       aaa.name as project,
                       aaa.state,
-                      sum(pt.remaining_hours) as remaining_hours
+                      sum(pt.remaining_hours) as remaining_hours,
+                      sum(pt.planned_hours) as planned_hours,
+                      sum(pt.total_hours) as total_hours
                  FROM project_project as pp,
                        account_analytic_account as aaa,
                        project_task as pt
-                 WHERE aaa.id=pp.category_id and pt.project_id=pp.id and pp.category_id=aaa.id
+                 WHERE aaa.id=pp.analytic_account_id and pt.project_id=pp.id and pp.analytic_account_id=aaa.id
                  GROUP BY aaa.user_id,aaa.state,aaa.name
                  UNION All
                  SELECT
@@ -154,17 +158,19 @@ class project_vs_remaining_hours(osv.osv):
                       pur.uid as uid,
                       aaa.name as project,
                       aaa.state,
-                      sum(pt.remaining_hours) as remaining_hours
+                      sum(pt.remaining_hours) as remaining_hours,
+                      sum(pt.planned_hours) as planned_hours,
+                      sum(pt.total_hours) as total_hours
                  FROM project_project as pp,
                       project_user_rel as pur,
                       account_analytic_account as aaa,
                       project_task as pt
-                 WHERE pur.project_id=pp.id and pt.project_id=pp.id and pp.category_id=aaa.id
+                 WHERE pur.project_id=pp.id and pt.project_id=pp.id and pp.analytic_account_id=aaa.id AND pur.uid != aaa.user_id
                  GROUP BY pur.uid,aaa.state,aaa.name
             )
         """)
 
-project_vs_remaining_hours()
+project_vs_hours()
 
 class task_by_days(osv.osv):
     _name = "task.by.days"
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index f22875cee4d..0292864397e 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
         <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
 
         <record id="view_task_project_user_tree" model="ir.ui.view">
@@ -91,7 +91,7 @@
 	                    <field name="project_id">
 	                        <filter icon="terp-folder-blue"
 	                        		string="My Projects"
-	                        		help="My Projects" domain="[('project_id','=',uid)]"/>	
+	                        		help="My Projects" domain="[('project_id','=',uid)]"/>
                           </field>
 
                           <field name="user_id" widget="selection">
@@ -123,7 +123,7 @@
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
                     <newline/>
-	                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
+	                <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
 	                    <field name="type" widget="selection"/>
 	                    <separator orientation="vertical"/>
                         <field name="date_start"/>
@@ -144,6 +144,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_task_project_user_search"/>
             <field name="context">{'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="help">Get detailed analysis by task</field>
         </record>
 
         <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
@@ -151,7 +152,7 @@
    <!-- Views and action for project dashboard -->
    <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
         <field name="name">project.vs.remaining.hour.tree</field>
-        <field name="model">project.vs.remaining.hours</field>
+        <field name="model">project.vs.hours</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Project and remaining hours" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
@@ -164,7 +165,7 @@
 
     <record id="view_project_vs_remaining_hours_graph" model="ir.ui.view">
          <field name="name">project.vs.remaining.hour.graph</field>
-         <field name="model">project.vs.remaining.hours</field>
+         <field name="model">project.vs.hours</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Project vs remaining hours" type="bar">
@@ -177,13 +178,25 @@
 
     <record id="action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
         <field name="name">Project and remaining hours</field>
-        <field name="res_model">project.vs.remaining.hours</field>
+        <field name="res_model">project.vs.hours</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
-        <field name="domain">[('uid','=',uid)]</field>
+        <field name="domain">[('uid','=',uid),('state','=','open')]</field>
         <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
     </record>
 
+	<record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_project_vs_remaining_hours_tree"/>
+            <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
+   </record>
+   <record id="open_view_project_vs_remaining_hours_graph" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
+            <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
+   </record>
     <!-- Views and action for project issue dashboard -->
     <record id="view_task_by_days_tree" model="ir.ui.view">
         <field name="name">task.by.days.tree</field>
@@ -222,38 +235,52 @@
     </record>
 
     <!-- Views and action for project  dashboard -->
-    <record id="view_task_by_days_vs_planned_hours_tree" model="ir.ui.view">
-        <field name="name">task.by.days.vs.planned.hours.tree</field>
-        <field name="model">report.project.task.user</field>
+   <record id="view_project_vs_planned_total_hours_tree" model="ir.ui.view">
+        <field name="name">project.vs.planned.total.hour.tree</field>
+        <field name="model">project.vs.hours</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Task By Days vs Planned Hours" >
-                <field name="day"/>
-                <field name="hours_planned"/>
+            <tree string="Project Vs Planned and Total Hours" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
+                <field name="project"/>
+                <field name="planned_hours"/>
+                <field name="total_hours"/>
             </tree>
         </field>
     </record>
 
-    <record id="view_task_by_days_vs_planned_hours_graph" model="ir.ui.view">
-         <field name="name">task.by.days.vs.planned.hours.graph</field>
-         <field name="model">report.project.task.user</field>
+    <record id="view_project_vs_planned_total_hours_graph" model="ir.ui.view">
+         <field name="name">project.vs.planned.total.hour.graph</field>
+         <field name="model">project.vs.hours</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Task By Days vs Planned Hours" type="bar">
-                 <field name="day"/>
-                 <field name="hours_planned" operator="+"/>
-                 <field name="project_id" group="True"/>
+             <graph string="Project Vs Planned and Total Hours" type="bar">
+                 <field name="project"/>
+                 <field name="planned_hours" operator="+"/>
+                 <field name="total_hours" operator="+"/>
              </graph>
          </field>
     </record>
 
-    <record id="action_task_by_days_vs_planned_hours_graph" model="ir.actions.act_window">
-        <field name="name">Task By Days vs Planned Hours</field>
-        <field name="res_model">report.project.task.user</field>
+    <record id="action_project_vs_planned_total_hours_graph" model="ir.actions.act_window">
+        <field name="name">My projects: Planned Vs Total hours</field>
+        <field name="res_model">project.vs.hours</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
-        <field name="view_id" ref="view_task_by_days_vs_planned_hours_graph"/>
+        <field name="domain">[('uid','=',uid),('state','=','open')]</field>
+        <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
     </record>
 
+	<record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_project_vs_planned_total_hours_tree"/>
+            <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
+    </record>
+    <record id="open_view_project_vs_planned_total_hours_graph" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
+            <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
+    </record>
     </data>
 </openerp>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 99ff1ea3629..b418b0a0dbf 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -11,7 +11,7 @@
 "access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1
 "access_project_message","project.message","model_project_message","project.group_project_user",1,1,1,1
 "access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,0,0,0
-"access_project_vs_remaining_hours","project.vs.remaining.hours","model_project_vs_remaining_hours","project.group_project_user",1,1,1,1
+"access_project_vs_hours","project.vs.hours","model_project_vs_hours","project.group_project_user",1,1,1,1
 "access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,1,1,1
 "access_partner_task user","base.res.partner user","base.model_res_partner","project.group_project_user",1,0,0,0
 "access_partner_task manager","base.res.partner manager","base.model_res_partner","project.group_project_manager",1,0,0,0
diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
index 25b3e94b57f..8cb3dbb7692 100644
--- a/addons/project/test/test_project.yml
+++ b/addons/project/test/test_project.yml
@@ -48,7 +48,10 @@
      if not new_prj:
      	raise Exception( "New project based on template not created")
      new_id = new_prj['res_id']
-     state = self.read(cr, uid, [new_id], ['state'])[0]['state']
+     new_prj = self.read(cr, uid, [new_id], ['name', 'state'])[0]
+     state = new_prj['state']
+     name = new_prj['name'] 
+     print "Project '%s' created"%name
      assert state == 'open', "Project in %s state. Project created from template project must be in open state"%state          
 - 
   Reset project template to normal project  
@@ -109,23 +112,24 @@
        - state == "open"
 
 
-
 -
   Test for task work allocation
-- 
-  Check if task 'Technical Training' in draft state
-- 
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Project is in draft state}:
-       - state == "draft"
-- 
-  Open task 'Technical Training' 
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_technicaltraining0")], {"lang": "en_US", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_model": "ir.ui.menu", "search_default_project_id":
-      False, "search_default_user_id": 1, "search_default_current": 1, "project_id":
-      False, "active_id": ref("project.menu_action_view_task"), })
-- 
+-
+  As i cancelled my project before, i check if the task 'Technical Training' is in cancelled state
+-
+  !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Task is in cancelled state}:
+       - state == "cancelled"
+-
+  Now in order to reactivate the task 'Technical Training', i click on the "Reactivate" button and fill the remaining hour field
+-
+  !record {model: config.compute.remaining, id: project_task_technicaltraining_remainingwiz0}:
+    remaining_hours: 30.0
+- |
+  I click the apply button
+-
+  !python {model: config.compute.remaining}: |
+      self.compute_hours(cr, uid, [ref('project_task_technicaltraining_remainingwiz0')], {'active_id': ref("project_task_technicaltraining0"),'button_reactivate': True})
+- |
   Check if task 'Technical Training' in  open state and for other initial values
 - 
   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Project is in open state}:
@@ -231,10 +235,7 @@
   Close the task
 - 
   !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_technicaltraining0")], {"lang": "en_US", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_model": "ir.ui.menu", "search_default_project_id":
-      False, "search_default_user_id": 1, "search_default_current": 1, "project_id":
-      False, "active_id": ref("project.menu_action_view_task"), })
+    self.do_close(cr, uid, [ref("project_task_technicaltraining0")], {'mail_send': False})
 - 
   Check if task in done state
 - 
@@ -277,7 +278,7 @@
         name: Training on yml
         user_id: base.user_root
 -
-   Check for effective hours and remaining hours
+   Check for effective hours and remaining hours, remaining_hours must be 5, effective_hours must be 45
 -
    !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After work task of 5 hours effective_hours must be equal to 45 and remaining_hours is 5}:
        - planned_hours == 30
@@ -289,10 +290,7 @@
   Close the task
 - 
   !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_technicaltraining0")], {"lang": "en_US", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_model": "ir.ui.menu", "search_default_project_id":
-      False, "search_default_user_id": 1, "search_default_current": 1, "project_id":
-      False, "active_id": ref("project.menu_action_view_task"), })
+    self.do_close(cr, uid, [ref("project_task_technicaltraining0")], {'mail_send': False})
 - 
   Check if task in done state
 - 
@@ -317,6 +315,6 @@
 - 
   Check if project in close state
 - 
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error}:
+  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: "Project must be in closed state"}:
        - state == "close"               
-                     
\ No newline at end of file
+                     
diff --git a/addons/project/test/test_project_delegation.yml b/addons/project/test/test_project_delegation.yml
new file mode 100644
index 00000000000..97d6b26519c
--- /dev/null
+++ b/addons/project/test/test_project_delegation.yml
@@ -0,0 +1,230 @@
+-
+  This scenario tests the delegation process. Closing all the delegated tasks(task delegation at multiple levels) transits the parent task from pending to open state.  
+- 
+  Creating a project OpenERP Documentaion
+- 
+  !record {model: project.project, id: project_project_openerpdocumentaion0}:
+    company_id: base.main_company
+    name: OpenERP Documentaion    
+    
+- 
+  Creating a task 'Develop book for Technical and Functional reference'
+- 
+  !record {model: project.task, id: project_task_documentation_book}:
+    name: Develop book for Technical and Functional reference
+    planned_hours: 20.0
+    project_id: project_project_openerpdocumentaion0
+    remaining_hours: 20.0
+    state: draft
+    
+- 
+  Open the task
+- 
+  !python {model: project.task}: |
+    self.do_open(cr, uid, [ref("project_task_documentation_book")],
+      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
+      "tz": False, "active_id": ref("project.menu_action_view_task"), }) 
+
+- 
+  Creating a task 'Publish the References'
+- 
+  !record {model: project.task, id: project_task_publish_book}:
+    name: Publish the References
+    planned_hours: 10.0
+    project_id: project_project_openerpdocumentaion0
+    remaining_hours: 10.0
+    state: draft
+    
+- 
+  Open the task
+- 
+  !python {model: project.task}: |
+    self.do_open(cr, uid, [ref("project_task_publish_book")],
+      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
+      "tz": False, "active_id": ref("project.menu_action_view_task"), }) 
+
+-
+  Test the delegate wizard 
+- 
+  Creating a delegate task 'Publish the References' of 15 hours, renaming parent task to 'CHECK Publish the References' of 1 hour
+- 
+  !record {model: project.task.delegate, id: project_task_publish_book_delegate}:
+    name: Publish the References
+    new_task_description: aaa
+    planned_hours: 15.0
+    planned_hours_me: 1.0
+    prefix: 'CHECK: Publish the References'
+    state: pending
+    user_id: base.user_demo
+    
+- 
+  Validating the delegate task
+- 
+  !python {model: project.task.delegate}: |
+    self.validate(cr, uid, [ref("project_task_publish_book_delegate")],
+      {"lang": "en_US", "active_model": "project.task", "tz": False, "record_id":
+      4, "active_ids": [ref("project_task_publish_book")], "active_id": ref("project_task_publish_book"),
+      })
+
+-
+  Check if parent task 'CHECK Publish the References' is in pending state
+- 
+  !assert {model: project.task, id: project_task_publish_book, severity: error, string: "Task must be in pending state after delegation"}:
+       - state == "pending"      
+- 
+  Creating a delegate task 'Prepare a book that gives functional overview of OpenERP' 
+- 
+  !record {model: project.task, id: project_task_delegate_openerp_tutorial}:
+    name: Prepare a book that gives functional overview of OpenERP
+    planned_hours: 30.0
+    project_id: project.project_project_openerpdocumentaion0
+    remaining_hours: 30.0
+    state: draft
+    
+- 
+  Open the task
+- 
+  !python {model: project.task}: |
+    self.do_open(cr, uid, [ref("project_task_delegate_openerp_tutorial")],
+      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
+      "tz": False, "active_id": ref("project.menu_action_view_task"), })
+          
+- 
+  Creating a delegate task 'Prepare a technical reference for creating your modules'
+- 
+  !record {model: project.task, id: project_task_delegate_developer_book}:
+    name: Prepare a technical reference for creating your modules
+    planned_hours: 30.0
+    project_id: project_project_openerpdocumentaion0
+    remaining_hours: 30.0
+    state: draft
+ 
+- 
+  Open the task
+- 
+  !python {model: project.task}: |
+    self.do_open(cr, uid, [ref("project_task_delegate_developer_book")],
+      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
+      "tz": False, "active_id": ref("project.menu_action_view_task"), })
+
+- 
+  Delegate task 'Develop book for Technical and Functional reference' to these tasks and make it pending
+- 
+  !record {model: project.task, id: project_task_documentation_book}:
+    child_ids:
+      - project.project_task_delegate_openerp_tutorial
+      - project.project_task_delegate_developer_book
+    planned_hours: 20.0
+    state: pending
+
+- 
+  Creating a delegate task 'Prepare documentation for Module Development'
+- 
+  !record {model: project.task, id: project_task_delegate_module_develop}:
+    name: Prepare documentation for Module Development
+    planned_hours: 30.0
+    project_id: project.project_project_openerpdocumentaion0
+    remaining_hours: 30.0
+    state: draft
+    
+
+- 
+  Creating a delegate 'Prepare documentation for Business Process Development'
+- 
+  !record {model: project.task, id: project_task_delegate_business_process_develop}:
+    name: Prepare documentation for Business Process Development
+    planned_hours: 30.0
+    project_id: project_project_openerpdocumentaion0
+    remaining_hours: 30.0
+    state: draft
+
+- 
+  Delegate task 'Prepare a technical reference for creating your modules' to these tasks and make it pending
+- 
+  !record {model: project.task, id: project_task_delegate_developer_book}:
+    child_ids:
+      - project.project_task_delegate_module_develop
+      - project.project_task_delegate_business_process_develop
+    planned_hours: 20.0
+    state: pending
+
+- 
+  Open the task
+- 
+  !python {model: project.task}: |
+    self.do_open(cr, uid, [ref("project_task_delegate_module_develop")],
+      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
+      "tz": False, "active_id": ref("project.menu_action_view_task"), })
+      
+- 
+  Open the task
+- 
+  !python {model: project.task}: |
+    self.do_open(cr, uid, [ref("project_task_delegate_business_process_develop")],
+      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
+      "tz": False, "active_id": ref("project.menu_action_view_task"), })      
+
+- 
+  Check if 'Prepare a technical reference for creating your modules' in pending state
+- 
+  !assert {model: project.task, id: project_task_delegate_developer_book, severity: error, string: Task must be in pending state}:
+       - state == "pending"
+                 
+- 
+  Close the child task 'Prepare documentation for Module Development'
+- 
+  !python {model: project.task}: |
+    self.do_close(cr, uid, [ref("project_task_delegate_module_develop")], {"lang": "en_US",
+      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
+      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
+      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
+      })
+      
+- 
+  Close the child task 'Prepare documentation for Business Process Development'
+- 
+  !python {model: project.task}: |
+    self.do_close(cr, uid, [ref("project_task_delegate_business_process_develop")], {"lang": "en_US",
+      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
+      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
+      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
+      })
+      
+- 
+  Parent task 'Prepare a technical reference for creating your modules' task must now be in open state
+- 
+  !assert {model: project.task, id: project_task_delegate_developer_book, severity: error, string: Task is in done state}:
+       - state == "open"
+       
+      
+- 
+  Check if task 'Develop book for Technical and Functional reference' in pending state
+- 
+  !assert {model: project.task, id: project_task_documentation_book, severity: error, string: Task is in pending state}:
+       - state == "pending"
+                 
+- 
+  Close the child project 'Prepare a technical reference for creating your modules'
+- 
+  !python {model: project.task}: |
+    self.do_close(cr, uid, [ref("project_task_delegate_developer_book")], {"lang": "en_US",
+      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
+      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
+      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
+      })
+      
+- 
+  Close the child project 'Prepare a book that gives functional overview of OpenERP' 
+- 
+  !python {model: project.task}: |
+    self.do_close(cr, uid, [ref("project_task_delegate_openerp_tutorial")], {"lang": "en_US",
+      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
+      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
+      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
+      })
+      
+- 
+  Parent task 'Develop book for Technical and Functional reference' must be now in open state 
+- 
+  !assert {model: project.task, id: project_task_documentation_book, severity: error, string: Task is in done state}:
+       - state == "open"                  
\ No newline at end of file
diff --git a/addons/project/wizard/project_close_task.py b/addons/project/wizard/project_close_task.py
index 715e70e59d0..78d18920abd 100644
--- a/addons/project/wizard/project_close_task.py
+++ b/addons/project/wizard/project_close_task.py
@@ -32,15 +32,28 @@ class project_close_task(osv.osv_memory):
     _name = "close.task"
     _description = "Project Close Task"
     _columns = {
-        'email': fields.char('E-Mail', size=64, help="Email Address"),
+        'manager_email': fields.char('Manager E-Mail ID', size=64, help="Email Address of Project's Manager"),
+        'partner_email': fields.char('Partner E-Mail ID', size=64, help="Email Address of Partner"),
         'description': fields.text('Description'),
         }
 
-    def _get_email(self, cr, uid, context=None):
+    def _get_manager_email(self, cr, uid, context=None):
         if context is None:
             context = {}
         email = ''
-        if 'task_id' in context:
+        if context.get('send_manager', False) and ('task_id' in context):
+            project_id = self.pool.get('project.task').read(cr, uid, context['task_id'], ['project_id'])['project_id'][0]
+            project = self.pool.get('project.project').browse(cr, uid, project_id)
+            manager_id = project.user_id or False
+            if manager_id and manager_id.user_email:
+                email = manager_id.user_email
+        return email
+    
+    def _get_partner_email(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        email = ''
+        if context.get('send_partner', False) and ('task_id' in context):
             task = self.pool.get('project.task').browse(cr, uid, context['task_id'])
             partner_id = task.partner_id or task.project_id.partner_id
             if partner_id and len(partner_id.address) and partner_id.address[0].email:
@@ -56,7 +69,8 @@ class project_close_task(osv.osv_memory):
         return ''
 
     _defaults = {
-       'email': _get_email,
+       'manager_email': _get_manager_email,
+       'partner_email': _get_partner_email,
        'description': _get_desc,
                }
     
@@ -71,12 +85,19 @@ class project_close_task(osv.osv_memory):
         if not 'task_id' in context:
             return {}
         close_task = self.read(cr, uid, ids[0], [])
-        to_adr = close_task['email']
+        to_adr = []
         description = close_task['description']
         
         if 'task_id' in context:
-            task_obj = self.pool.get('project.task')
-            for task in task_obj.browse(cr, uid, [context['task_id']], context=context):
+            if context.get('send_manager', False) and not close_task.get('manager_email', False):
+                raise osv.except_osv(_('Error'), _("Please specify the email address of Manager."))
+            
+            elif context.get('send_partner', False) and not close_task.get('partner_email', False):
+                raise osv.except_osv(_('Error'), _("Please specify the email address of partner."))
+            
+            else:
+                task_obj = self.pool.get('project.task')
+                task = task_obj.browse(cr, uid, context['task_id'], context=context)
                 project = task.project_id
                 subject = "Task '%s' closed" % task.name
                 if task.user_id and task.user_id.address_id and task.user_id.address_id.email:
@@ -84,8 +105,7 @@ class project_close_task(osv.osv_memory):
                     signature = task.user_id.signature
                 else:
                     raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!"))
-                if to_adr:
-                    val = {
+                val = {
                         'name': task.name,
                         'user_id': task.user_id.name,
                         'task_id': "%d/%d" % (project.id, task.id),
@@ -93,13 +113,17 @@ class project_close_task(osv.osv_memory):
                         'date_end': task.date_end,
                         'state': task.state
                     }
-                    header = (project.warn_header or '') % val
-                    footer = (project.warn_footer or '') % val
-                    body = u'%s\n%s\n%s\n\n-- \n%s' % (header, description, footer, signature)
-                    email(from_adr, [to_adr], subject, body.encode('utf-8'), email_bcc=[from_adr])
-                    task_obj.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
-                else:
-                    raise osv.except_osv(_('Error'), _("Please specify the email address of partner."))
+                
+                header = (project.warn_header or '') % val
+                footer = (project.warn_footer or '') % val
+                body = u'%s\n%s\n%s\n\n-- \n%s' % (header, description, footer, signature)
+                to_adr.append(context.get('send_manager', '') and close_task.get('manager_email', '') or '')
+                to_adr.append(context.get('send_partner', '') and close_task.get('partner_email', '') or '')
+                email(from_adr, to_adr, subject, body.encode('utf-8'), email_bcc=[from_adr])
+                task_obj.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
+                message = _('Task ') + " '" + task.name + "' "+ _("is Done.")
+                self.log(cr, uid, task.id, message)
+            
         return {}
 
 project_close_task()
diff --git a/addons/project/wizard/project_close_task_view.xml b/addons/project/wizard/project_close_task_view.xml
index e46ddf7d6da..37b6646232a 100644
--- a/addons/project/wizard/project_close_task_view.xml
+++ b/addons/project/wizard/project_close_task_view.xml
@@ -12,7 +12,9 @@
               		  <separator string="" colspan="4"/>
               		  <group colspan="4" col="6">
               		  <newline/>
-		              <field name="email"/>
+		              <field name="manager_email" invisible="not context.get('send_manager',False)"/>
+		              <newline/>
+		              <field name="partner_email" invisible="not context.get('send_partner',False)"/>
 		              <newline/>
 		              <field name="description" />
 		              </group>
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index 850f27b99d4..cf4ccb80d29 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -19,6 +19,8 @@
 #
 ##############################################################################
 
+from lxml import etree
+
 from tools.translate import _
 from osv import fields, osv
 
@@ -83,7 +85,36 @@ class project_task_delegate(osv.osv_memory):
        'new_task_description': _get_new_desc,
        'state': 'pending',
     }
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        users_obj = self.pool.get('res.users')
+        obj_tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
+        tm = obj_tm and obj_tm.name or 'Hours'
 
+        res = super(project_task_delegate, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
+
+        if tm in ['Hours','Hour']:
+            return res
+
+        eview = etree.fromstring(res['arch'])
+
+        def _check_rec(eview):
+            if eview.attrib.get('widget','') == 'float_time':
+                eview.set('widget','float')
+            for child in eview:
+                _check_rec(child)
+            return True
+
+        _check_rec(eview)
+
+        res['arch'] = etree.tostring(eview)
+
+        for f in res['fields']:
+            if 'Hours' in res['fields'][f]['string']:
+                res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
+
+        return res
+    
     def validate(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 762810eba64..68ebb1692d2 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -26,7 +26,7 @@
 		              <newline/>
 		              <group colspan="4" col="6">
 		            		<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-		            		<button icon="gtk-ok" name="validate" string="Validate" type="object"/>
+		            		<button icon="gtk-ok" name="validate" string="Approve" type="object"/>
 		              </group>
 			  	</form>
             </field>
diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py
index c8f379b18e5..1e78db79bf0 100644
--- a/addons/project_caldav/__openerp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name": "Caldav task management",
     "version": "1.0",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "category": "Generic Modules/Others",
     "description": """ Synchronize between Project task and Caldav Vtodo.""",
     "depends": ["project", "caldav", "base_calendar"],
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index ba46d295234..1707c1f76d8 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -37,16 +37,14 @@ recording them externally. That way, the mind is freed from the job of
 remembering everything that needs to be done, and can concentrate on actually
 performing those tasks.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['project'],
     'init_xml': [],
     'update_xml': [
         'project_gtd_data.xml',
         'project_gtd_view.xml',
-        'project_gtd_wizard.xml',
         'security/ir.model.access.csv',
         'wizard/project_gtd_empty_view.xml',
-        'wizard/project_gtd_daily_view.xml',
         'wizard/project_gtd_fill_view.xml',
     ],
     'demo_xml': ['project_gtd_demo.xml'],
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index c2222fdb5d6..0549dc0bedf 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -173,15 +173,15 @@ class project_task(osv.osv):
         if res['type'] == 'search':
             tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]))
             search_extended ='''<newline/><group col="%d" expand="0" string="%s" groups="project_gtd.group_project_getting">''' % (len(tt)+7,_('Getting Things Done'))
-            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True}" icon="gtk-new" string="%s"/>''' % (_('Inbox'),)
-            search_extended += '''<filter domain="[('state', 'in', ('draft','open','pending'))]" context="{'set_editable':True,'set_visible':True}" icon="gtk-new" string="%s"/>''' % (_('All'),)
+            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True}" icon="gtk-new" string="%s"/>''' % (_('Inbox'),)
+#            search_extended += '''<filter domain="[('state', 'in', ('draft','open','pending'))]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True}" icon="gtk-new" string="%s"/>''' % (_('Editable'),)
             search_extended += '''<separator orientation="vertical"/>'''
             for time in tt:
                 if time.icon:
                     icon = time.icon
                 else :
                     icon=""
-                search_extended += '''<filter domain="[('timebox_id','=', ''' + str(time.id) + ''')]" icon="''' + icon + '''" string="''' + time.name + '''" context="{'set_visible':True}"/>'''
+                search_extended += '''<filter domain="[('timebox_id','=', ''' + str(time.id) + ''')]" icon="''' + icon + '''" string="''' + time.name + '''" context="{'gtd_visible':True}"/>'''
             search_extended += '''
             <separator orientation="vertical"/>
             <field name="context_id" select="1" widget="selection" />
diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml
index a696e901686..a5bf075b6f6 100644
--- a/addons/project_gtd/project_gtd_demo.xml
+++ b/addons/project_gtd/project_gtd_demo.xml
@@ -39,18 +39,18 @@
         <field name="name">Long Term</field>
         <field name="icon">terp-project</field>
     </record>
-    
+
     <record id="project.project_task_116" model="project.task">
         <field name="planned_hours">38.0</field>
         <field name="remaining_hours">38.0</field>
         <field name="timebox_id" ref="timebox_daily"/>
         <field name="context_id" ref="context_office"/>
-        <field name="type" ref="project.project_tt_development"/>
+        <field name="type_id" ref="project.project_tt_development"/>
         <field name="user_id" ref="base.user_root"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field name="name">Specific adaptation to MRP</field>
     </record>
-   
+
      <record id="project.project_task_201" model="project.task">
         <field name="sequence">40</field>
         <field name="planned_hours">32.0</field>
@@ -71,19 +71,19 @@
         <field name="user_id" ref="base.user_root"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field name="name">Validation + latest modifications.</field>
-      </record> 
-    
+      </record>
+
     <record id="project.project_task_116" model="project.task">
         <field name="planned_hours">38.0</field>
         <field name="remaining_hours">38.0</field>
         <field name="timebox_id" ref="timebox_daily"/>
         <field name="context_id" ref="context_office"/>
-        <field name="type" ref="project.project_tt_development"/>
+        <field name="type_id" ref="project.project_tt_development"/>
         <field name="user_id" ref="base.user_root"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field name="name">Specific adaptation to MRP</field>
     </record>
-   
+
      <record id="project.project_task_201" model="project.task">
         <field name="sequence">40</field>
         <field name="planned_hours">32.0</field>
@@ -104,7 +104,7 @@
         <field name="user_id" ref="base.user_root"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field name="name">Validation + latest modifications.</field>
-      </record> 
-    
+      </record>
+
     </data>
 </openerp>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 919412cd27d..8527b480955 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -9,7 +9,6 @@
             <tree string="Context">
                 <field name="sequence" invisible="1"/>
                 <field name="name" select="1"/>
-                <field name="project_default_id" select="1"/>
             </tree>
         </field>
     </record>
@@ -22,7 +21,6 @@
             <form string="Context">
                 <field name="name"/>
                 <field name="sequence"/>
-                <field name="project_default_id"/>
             </form>
         </field>
     </record>
@@ -80,9 +78,9 @@
         <field name="inherit_id" ref="project.view_task_tree2" />
         <field name="arch" type="xml">
             <field name="remaining_hours" position="after">
-                <field string="Timebox" name="timebox_id" groups="project_gtd.group_project_getting" invisible=" not context.get('set_visible',True)"/>
-                <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open" groups="project_gtd.group_project_getting" invisible=" not context.get('set_visible',True)"/>
-                <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open" groups="project_gtd.group_project_getting" invisible=" not context.get('set_visible',False)"/>
+                <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open" groups="project_gtd.group_project_getting" invisible=" not context.get('gtd_visible',False)"/>
+                <field string="Timebox" name="timebox_id" groups="project_gtd.group_project_getting" invisible=" not context.get('gtd_visible', False)"/>
+                <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open" groups="project_gtd.group_project_getting" invisible=" not context.get('gtd_visible',False)"/>
                 <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks" invisible="not context.get('set_visible',False)"/>
             </field>
         </field>
@@ -96,9 +94,10 @@
         <field name="arch" type="xml">
             <field name="progress" position="after">
                 <field name="context_id" widget="selection" groups="project_gtd.group_project_getting"/>
-                <field name="timebox_id" select="1" groups="project_gtd.group_project_getting"/>
+                <field name="timebox_id" widget="selection" select="1" groups="project_gtd.group_project_getting"/>
             </field>
         </field>
     </record>
+    
     </data>
 </openerp>
diff --git a/addons/project_gtd/project_gtd_wizard.xml b/addons/project_gtd/project_gtd_wizard.xml
deleted file mode 100644
index e01db8218c6..00000000000
--- a/addons/project_gtd/project_gtd_wizard.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-
-		<!--<wizard string="My Daily Timebox"
-			model="project.gtd.timebox"
-			name="project.gtd.timebox.daily"
-			id="open_gtd_timebox_daily"/>-->
-
-<!--		<menuitem name="My Daily Timebox" id="menu_open_time_daily_inbox" -->
-<!--				parent="menu_open_time" action="open_gtd_timebox_daily"-->
-<!--				 icon="STOCK_JUSTIFY_FILL" type="wizard"/>-->
-
-	<!--	<wizard string="Plannify Timebox"
-			model="project.gtd.timebox"
-			name="project.gtd.timebox.fill"
-			id="open_gtd_timebox_fill"/>
-
--->
-		<!--<wizard string="Empty Timebox"
-			model="project.gtd.timebox"
-			name="project.gtd.timebox.empty"
-			id="open_gtd_timebox_empty"/>
--->
-
-	</data>
-</openerp>
diff --git a/addons/project_gtd/wizard/__init__.py b/addons/project_gtd/wizard/__init__.py
index e92fa265ed3..aa2bbc22c45 100644
--- a/addons/project_gtd/wizard/__init__.py
+++ b/addons/project_gtd/wizard/__init__.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-import project_gtd_daily
 import project_gtd_empty
 import project_gtd_fill
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project_gtd/wizard/project_gtd_daily.py b/addons/project_gtd/wizard/project_gtd_daily.py
deleted file mode 100644
index bacc1af85d9..00000000000
--- a/addons/project_gtd/wizard/project_gtd_daily.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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, fields
-from tools.translate import _
-
-class project_timebox_open(osv.osv_memory):
-
-    _name = 'project.timebox.open'
-    _description = 'Project Timebox Open'
-
-    def open_tb(self, cr, uid, data, context=None):
-        ids = self.pool.get('project.gtd.timebox').search(cr, uid, [])
-        if not len(ids):
-            raise osv.except_osv(_('Error !'), _('No timebox of the type defined !'))
-        if len(ids) >= 1:
-            domain = "[('id','in',["+','.join(map(str, ids))+"])]"
-        value = {
-            'domain': domain,
-            'name': 'My Daily Timebox',
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'project.gtd.timebox',
-            'view_id': False,
-            'type': 'ir.actions.act_window'
-        }
-        if len(ids) == 1:
-            value['res_id'] = ids[0]
-            value['context'] = {'record_id':ids[0]}
-        return value
-
-project_timebox_open()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_gtd/wizard/project_gtd_daily_view.xml b/addons/project_gtd/wizard/project_gtd_daily_view.xml
deleted file mode 100644
index c49585f9112..00000000000
--- a/addons/project_gtd/wizard/project_gtd_daily_view.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    	<record id="view_project_gtd_daily" model="ir.ui.view">
-            <field name="name">My Daily Timebox</field>
-            <field name="model">project.timebox.open</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              	<form string="My Daily Timebox">
-              		<group width="340" height="70">
-              			<label string="You can open Daily Timebox"/>
-              		  	<newline/>
-		              	<group>
-				        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-		              	<button name="open_tb" icon="gtk-ok" string="_Open Timebox" type="object" default_focus="1"/>
-		              </group>
-		            </group>
-			  	</form>
-            </field>
-		</record>
-
-		<record id="action_project_gtd_daily" model="ir.actions.act_window">
-	           <field name="name">My Daily Timebox</field>
-	           <field name="type">ir.actions.act_window</field>
-	           <field name="res_model">project.timebox.open</field>
-	           <field name="view_type">form</field>
-	           <field name="view_mode">form</field>
-	           <field name="view_id" ref="view_project_gtd_daily"/>
-		       <field name="context">{'record_id' : active_id}</field>
-	           <field name="target">new</field>
-    	</record>
-
-    	<record model="ir.values" id="project_gtd_daily_values">
-            <field name="model_id" ref="model_project_gtd_timebox" />
-            <field name="object" eval="1" />
-            <field name="name">My Daily Timebox</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_project_gtd_daily'))" />
-            <field name="key">action</field>
-            <field name="model">project.gtd.timebox</field>
-        </record>
-
-
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 1c3d221c6ac..6206a0a5d89 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -8,8 +8,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Plannify Timebox">
-              		  <field name="timebox_id" />
-              		  <field name="timebox_to_id" />
+              		  <field name="timebox_id" widget="selection"/>
+              		  <field name="timebox_to_id" widget="selection"/>
               		  <field colspan="4" name="task_ids" nolabel="1" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
 		              <group colspan="4" col="6">
 				            <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 84414cf8a1b..5f04ad40640 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -28,7 +28,7 @@
     'description': """
         This module provide Issues/Bugs Management in Project
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': [
         'crm',
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 8fe05eddebe..343d0e98b35 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -86,6 +86,6 @@
             <field name="view_id" ref="board_project_issue_form"/>
         </record>
         <menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.next_id_86"
-            icon="terp-graph" action="open_board_project_issue"/>
+            action="open_board_project_issue"/>
     </data>
 </openerp>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index ed648fb2969..62381dbfad0 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -159,9 +159,7 @@ class project_issue(osv.osv, crm.crm_case):
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
-        'email_cc': fields.char('Watchers Emails', size=256, help="These people\
- will receive a copy of the future" \
-" communication between partner and users by email"),
+        'email_cc': fields.char('Watchers Emails', size=256, help="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"),
         'date_open': fields.datetime('Opened', readonly=True),
         # Project Issue fields
         'date_closed': fields.datetime('Closed', readonly=True),
@@ -178,18 +176,16 @@ class project_issue(osv.osv, crm.crm_case):
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
-        'date_open': fields.datetime('Opened', readonly=True),
         'day_open': fields.function(_compute_day, string='Days to Open', \
                                 method=True, multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 method=True, multi='day_close', type="float", store=True),
-        'assigned_to': fields.many2one('res.users', 'Assigned to'),
+        'assigned_to': fields.many2one('res.users', 'Assigned to', help='This is the current user to whom the related task have been assigned'),
         'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \
                                 method=True, multi='working_days_open', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
                                 method=True, multi='working_days_close', type="float", store=True),
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
-        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
     }
@@ -301,6 +297,8 @@ class project_issue(osv.osv, crm.crm_case):
                 data['project_id'] = case.project_id.project_escalation_id.id
                 if case.project_id.project_escalation_id.user_id:
                     data['user_id'] = case.project_id.project_escalation_id.user_id.id
+                if case.task_id:
+                    self.pool.get('project.task').write(cr, uid, [case.task_id.id], {'project_id': data['project_id'], 'user_id': False})
             else:
                 raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!'))
             self.write(cr, uid, [case.id], data)
@@ -407,8 +405,21 @@ project_issue()
 class project(osv.osv):
     _inherit = "project.project"
     _columns = {
-        'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
+        'resource_calendar_id' : fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        '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])
+         if project_obj.project_escalation_id:
+             if project_obj.project_escalation_id.id == project_obj.id:
+                 return False
+         return True
+
+    _constraints = [
+        (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id'])
+    ]
 project()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index cbf24b18f76..3845cf6bce0 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -73,14 +73,24 @@
                         </page>
                         <page string="Emails" groups="base.group_extended">
                             <group colspan="4">
-                            <field colspan="4" name="email_cc" string="CC"/>
+                            <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                                <tree string="Communication history">
+                                    <field name="display_text" string="History Information"/>
+                                    <button
+                                        string="Reply"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
+                                        icon="terp-mail-replied" type="action" />
+                                </tree>
                                 <form string="Communication history">
-                                    <group col="6" colspan="4">
-                                    <field name="date"/>
-                                    <field name="email_to"/>
-                                    <field name="email_from"/>
+                                    <group col="4" colspan="4">
+                                        <field name="email_from"/>
+                                        <field name="date"/>
+                                        <field name="email_to" widget="char" size="512"/>
+                                        <field name="email_cc" widget="char" size="512"/>
+                                        <field name="name" colspan="4" widget="char" size="512"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
@@ -90,22 +100,18 @@
                                             <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
                                         </page>
                                     </notebook>
-                                    <button colspan="4" string="Reply to Last Email" name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
-                                    icon="gtk-undo" type="action" />
+                                    <button colspan="4"
+                                        string="Reply"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
+                                        icon="terp-mail-replied" type="action" />
                                 </form>
-                                <tree string="Communication history">
-                                    <field name="date"/>
-                                    <field name="email_from" />
-                                    <field name="email_to"/>
-                                    <field name="description"/>
-                                </tree>
-                           </field>
+                            </field>
                            <separator colspan="4"/>
                            <button colspan="4" string="Send New Email"
                                name="%(crm.action_crm_send_mail)d"
                                context="{'mail':'new', 'model': 'project.issue'}"
-                               icon="gtk-go-forward" type="action" />
+                               icon="terp-mail-message-new" type="action" />
                         </page>
                            <page string="History" groups="base.group_extended">
                             <group col="2" colspan="2">
@@ -127,19 +133,6 @@
                             <field name="id"/>
                             <field name="active"/>
                             </group>
-                            <field name="log_ids" nolabel="1" colspan="4">
-                                <tree string="Logs">
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </tree>
-                                <form string="Logs">
-                                    <separator string="Action Information" colspan="4"/>
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </form>
-                            </field>
                         </page>
                     </notebook>
                 </form>
@@ -293,5 +286,23 @@
             </field>
         </record>
 
+	# ------------------------------------------------------
+    # Project
+    # ------------------------------------------------------
+
+        <record id="view_project_form_inherited" model="ir.ui.view">
+            <field name="name">project.project.form.inherited</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <field name="priority" position="before">
+                    <field name="resource_calendar_id"/>
+                    <field name="project_escalation_id"/>
+                    <field name="reply_to"/>
+                </field>
+            </field>
+       </record>
+       
     </data>
 </openerp>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 7405026d05d..2389e65e1d7 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -130,7 +130,7 @@
 
                   </group>
                    <newline/>
-                   <group  expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
+                   <group  expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
                     		<field name="partner_id"/>
                     		<field name="assigned_to" widget="selection"/>
                     		<separator orientation="vertical"/>
diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index 7f2d124f8b8..db08233cc98 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -28,7 +28,7 @@
     'description': """ 
                     This module adds the Timesheet support for the Issues/Bugs Management in Project
                 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': [
         'project_issue',
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index 132fa50189b..f5e7d776436 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -27,7 +27,7 @@ class project_issue(osv.osv):
     _description = 'project issue'
     _columns = {
         'timesheet_ids': fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
-        'analytic_account_id': fields.related('project_id', 'category_id', string='Analytic Account')
+        'analytic_account_id': fields.related('project_id', 'analytic_account_id', string='Analytic Account')
     }
     
 project_issue()
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 0ff6413b226..13aed4eb129 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -12,11 +12,11 @@
                         <field name="analytic_account_id" invisible="1"/>
                         <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
                             <tree editable="top" string="Timesheet">
+                            	<field name="name"/>
+                            	<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
+                            	<field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
                                 <field name="date"/>
                                 <field name="user_id"/>
-                                <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
-                                <field name="name"/>
-                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
                                 <field invisible="1" name="journal_id"/>
                                 <field invisible="1" name="product_id"/>
                                 <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
@@ -29,4 +29,4 @@
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index ae391ebbb03..0fb16cdc23d 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name": "Long Term Project Management",
     "version": "1.1",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "website": "http://www.openerp.com",
     "category": "Generic Modules/Projects & Services",
     "depends": ["resource", "project"],
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index f76ab413e23..f4ae126ee67 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -93,19 +93,19 @@ class project_phase(osv.osv):
 
     _columns = {
         'name': fields.char("Name", size=64, required=True),
-        'date_start': fields.datetime('Start Date', help="Starting Date of the phase"),
-        'date_end': fields.datetime('End Date', help="Ending Date of the phase"),
-        'constraint_date_start': fields.datetime('Start Date', help='force the phase to start after this date'),
-        'constraint_date_end': fields.datetime('End Date', help='force the phase to finish before this date'),
+        'date_start': fields.date('Start Date', help="Starting Date of the phase", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'date_end': fields.date('End Date', help="Ending Date of the phase", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'constraint_date_start': fields.date('Start Date', help='force the phase to start after this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'constraint_date_end': fields.date('End Date', help='force the phase to finish before this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'project_id': fields.many2one('project.project', 'Project', required=True),
-        'next_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'prv_phase_id', 'next_phase_id', 'Next Phases'),
-        'previous_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'next_phase_id', 'prv_phase_id', 'Previous Phases'),
+        'next_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'prv_phase_id', 'next_phase_id', 'Next Phases', states={'cancelled':[('readonly',True)]}),
+        'previous_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'next_phase_id', 'prv_phase_id', 'Previous Phases', states={'cancelled':[('readonly',True)]}),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of phases."),
-        'duration': fields.float('Duration', required=True, help="By default in days"),
-        'product_uom': fields.many2one('product.uom', 'Duration UoM', required=True, help="UoM (Unit of Measure) is the unit of measurement for Duration"),
-        'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks"),
-        'resource_ids': fields.one2many('project.resource.allocation', 'phase_id', "Project Resources"),
-        'responsible_id': fields.many2one('res.users', 'Responsible'),
+        'duration': fields.float('Duration', required=True, help="By default in days", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'product_uom': fields.many2one('product.uom', 'Duration UoM', required=True, help="UoM (Unit of Measure) is the unit of measurement for Duration", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'resource_ids': fields.one2many('project.resource.allocation', 'phase_id', "Project Resources",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'responsible_id': fields.many2one('res.users', 'Responsible', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.')
@@ -114,7 +114,7 @@ class project_phase(osv.osv):
         'responsible_id': lambda obj,cr,uid,context: uid,
         'state': 'draft',
         'sequence': 10,
-        'product_uom': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', 'day')], context=c)[0]
+        'product_uom': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Day'))], context=c)[0]
     }
     _order = "name"
     _constraints = [
@@ -130,7 +130,7 @@ class project_phase(osv.osv):
         if project:
             project_id = project_obj.browse(cr, uid, project, context=context)
             if project_id.date_start:
-                result['date_start'] = mx.DateTime.strptime(project_id.date_start, "%Y-%m-%d").strftime('%Y-%m-%d %H:%M:%S')
+                result['date_start'] = mx.DateTime.strptime(project_id.date_start, "%Y-%m-%d").strftime('%Y-%m-%d')
                 return {'value': result}
         return {'value': {'date_start': []}}
 
@@ -147,15 +147,15 @@ class project_phase(osv.osv):
        resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)])
        if resource_id:
 #            cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
-            res = resource_obj.read(cr, uid, resource_id[0], ['calendar_id'], context=context)[0]
+            res = resource_obj.read(cr, uid, resource_id, ['calendar_id'], context=context)[0]
             cal_id = res.get('calendar_id', False) and res.get('calendar_id')[0] or False
             if cal_id:
                 calendar_id = cal_id
        default_uom_id = self._get_default_uom_id(cr, uid)
        avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
        work_times = cal_obj.interval_min_get(cr, uid, calendar_id, date_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
-       dt_start = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
-       self.write(cr, uid, [phase.id], {'date_start': dt_start, 'date_end': date_end.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+       dt_start = work_times[0][0].strftime('%Y-%m-%d')
+       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:
@@ -170,15 +170,15 @@ class project_phase(osv.osv):
        resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)], context=context)
        if resource_id:
 #            cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
-            res = resource_obj.read(cr, uid, resource_id[0], ['calendar_id'], context=context)[0]
+            res = resource_obj.read(cr, uid, resource_id, ['calendar_id'], context=context)[0]
             cal_id = res.get('calendar_id', False) and res.get('calendar_id')[0] or False
             if cal_id:
                 calendar_id = cal_id
        default_uom_id = self._get_default_uom_id(cr, uid)
        avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
        work_times = cal_obj.interval_get(cr, uid, calendar_id, date_start, avg_hours or 0.0, resource_id and resource_id[0] or False)
-       dt_end = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
-       self.write(cr, uid, [phase.id], {'date_start': date_start.strftime('%Y-%m-%d %H:%M:%S'), 'date_end': dt_end}, context=context)
+       dt_end = work_times[-1][1].strftime('%Y-%m-%d')
+       self.write(cr, uid, [phase.id], {'date_start': date_start.strftime('%Y-%m-%d'), 'date_end': dt_end}, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         resource_calendar_obj = self.pool.get('resource.calendar')
@@ -190,6 +190,8 @@ class project_phase(osv.osv):
             return super(project_phase, self).write(cr, uid, ids, vals, context=context)
         # Consider calendar and efficiency if the phase is performed by a resource
         # otherwise consider the project's working calendar
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         phase = self.browse(cr, uid, ids[0], context=context)
         calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
         resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context)
@@ -203,17 +205,17 @@ class project_phase(osv.osv):
         # Change the date_start and date_end
         # for previous and next phases respectively based on valid condition
         if vals.get('date_start', False) and vals['date_start'] < phase.date_start:
-                dt_start = mx.DateTime.strptime(vals['date_start'], '%Y-%m-%d %H:%M:%S')
+                dt_start = mx.DateTime.strptime(vals['date_start'], '%Y-%m-%d')
                 work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False)
                 if work_times:
-                    vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
+                    vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d')
                 for prv_phase in phase.previous_phase_ids:
                     self._check_date_start(cr, uid, prv_phase, dt_start, context=context)
         if vals.get('date_end', False) and vals['date_end'] > phase.date_end:
-                dt_end = mx.DateTime.strptime(vals['date_end'],'%Y-%m-%d %H:%M:%S')
+                dt_end = mx.DateTime.strptime(vals['date_end'],'%Y-%m-%d')
                 work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
                 if work_times:
-                    vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
+                    vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d')
                 for next_phase in phase.next_phase_ids:
                     self._check_date_end(cr, uid, next_phase, dt_end, context=context)
         return super(project_phase, self).write(cr, uid, ids, vals, context=context)
@@ -246,7 +248,9 @@ class project_resource_allocation(osv.osv):
     _rec_name = 'resource_id'
     _columns = {
         'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
-        'phase_id': fields.many2one('project.phase', 'Project Phase', required=True),
+        'phase_id': fields.many2one('project.phase', 'Project Phase', ondelete='cascade', required=True),
+        'phase_id_date_start': fields.related('phase_id', 'date_start', type='date', string='Starting Date of the phase'),
+        'phase_id_date_end': fields.related('phase_id', 'date_end', type='date', string='Ending Date of the phase'),
         'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"),
     }
     _defaults = {
@@ -259,7 +263,7 @@ class project(osv.osv):
     _inherit = "project.project"
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-        'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
+        'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
     }
 
 project()
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index fd965e4c792..7718048dc05 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -249,14 +249,14 @@
             <field eval="1" name="active"/>
             <field eval="1" name="warn_manager"/>
             <field eval="0" name="warn_customer"/>
-            <field name="date_start">2010-02-25</field>
+            <field name="date_start" eval="(DateTime.now()-timedelta(70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field eval="1" name="priority"/>
             <field name="state">open</field>
             <field name="type">normal</field>
             <field name="description">Develop an OpenERP Website.</field>
             <field eval="[(6, 0, [ref('res_users_manager0'), ref('res_users_user0'), ref('res_users_userfinance0'), ref('res_users_userdesign0'), ref('res_users_userdeveloper0'), ref('res_users_usertester0'), ref('res_users_useranalyst0')])]" name="members"/>
-            <field name="date">2010-04-30</field>
+            <field name="date" eval="(DateTime.now()+timedelta(60-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="currency_id" ref="base.EUR"/>
             <field eval="[(6, 0, [])]" name="type_ids"/>
@@ -269,14 +269,14 @@
             <field name="name">Information Gathering and Understanding</field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="10" name="sequence"/>
-            <field name="constraint_date_end">2010-03-11 15:37:00</field>
-            <field name="date_start">2010-02-25 15:33:00</field>
+            <field name="constraint_date_end" eval="(DateTime.now()+timedelta(18-70)).strftime('%Y-%m-%d')"/>
+            <field name="date_start" eval="(DateTime.now()-timedelta(70)).strftime('%Y-%m-%d')"/>
             <field name="state">draft</field>
             <field name="responsible_id" ref="res_users_demouser1"/>
-            <field eval="10.0" name="duration"/>
+            <field eval="15.0" name="duration"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field name="constraint_date_start">2010-02-24 15:37:00</field>
-            <field name="date_end">2010-03-10 15:33:00</field>
+            <field name="constraint_date_start" eval="(DateTime.now()+timedelta(2-70)).strftime('%Y-%m-%d')"/>
+            <field name="date_end" eval="(DateTime.now()+timedelta(15-70)).strftime('%Y-%m-%d')"/>
         </record>
 
         <record id="project_phase_planning0" model="project.phase">
@@ -284,59 +284,59 @@
             <field name="name">Planning</field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="10" name="sequence"/>
-            <field name="constraint_date_end">2010-03-25 15:49:00</field>
-            <field name="date_start">2010-02-18 15:48:00</field>
-            <field name="state">draft</field>
-            <field name="responsible_id" ref="res_users_manager0"/>
-            <field eval="7.0" name="duration"/>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field name="constraint_date_start">2010-02-12 15:49:00</field>
-            <field name="date_end">2010-03-11 15:48:00</field>
-        </record>
-
-        <record id="project_phase_webdesign0" model="project.phase">
-            <field eval="[(6, 0, [ref('project_phase_informationgatheringandunderstanding0'), ref('project_phase_planning0')])]" name="previous_phase_ids"/>
-            <field name="name">Web Design </field>
-            <field name="product_uom" ref="product.uom_day"/>
-            <field eval="10" name="sequence"/>
-            <field name="constraint_date_end">2010-04-15 16:08:00</field>
-            <field name="date_start">2010-04-01 16:02:00</field>
-            <field name="state">draft</field>
-            <field name="responsible_id" ref="res_users_userdesign0"/>
-            <field eval="10.0" name="duration"/>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field name="constraint_date_start">2010-03-09 16:00:00</field>
-            <field name="date_end">2010-04-10 16:02:00</field>
-        </record>
-
-        <record id="project_phase_developmentintegrationandtesting0" model="project.phase">
-            <field eval="[(6, 0, [ref('project_phase_informationgatheringandunderstanding0'), ref('project_phase_planning0'), ref('project_phase_webdesign0')])]" name="previous_phase_ids"/>
-            <field name="name">Development, Integration and Testing</field>
-            <field name="product_uom" ref="product.uom_day"/>
-            <field eval="10" name="sequence"/>
-            <field name="constraint_date_end">2010-04-27 17:29:00</field>
-            <field name="date_start">2010-04-12 16:10:00</field>
+            <field name="constraint_date_end" eval="(DateTime.now()+timedelta(28-70)).strftime('%Y-%m-%d')"/>
+            <field name="date_start" eval="(DateTime.now()+timedelta(10-70)).strftime('%Y-%m-%d')"/>
             <field name="state">draft</field>
             <field name="responsible_id" ref="res_users_manager0"/>
             <field eval="15.0" name="duration"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field name="constraint_date_start">2010-03-10 16:11:00</field>
-            <field name="date_end">2010-04-26 16:10:00</field>
+            <field name="constraint_date_start" eval="(DateTime.now()+timedelta(13-70)).strftime('%Y-%m-%d')"/>
+            <field name="date_end" eval="(DateTime.now()+timedelta(25-70)).strftime('%Y-%m-%d')"/>
+        </record>
+
+        <record id="project_phase_webdesign0" model="project.phase">
+            <field eval="[(6, 0, [ref('project_phase_planning0')])]" name="previous_phase_ids"/>
+            <field name="name">Web Design </field>
+            <field name="product_uom" ref="product.uom_day"/>
+            <field eval="10" name="sequence"/>
+            <field name="constraint_date_end" eval="(DateTime.now()+timedelta(45-70)).strftime('%Y-%m-%d')"/>
+            <field name="date_start" eval="(DateTime.now()+timedelta(20-70)).strftime('%Y-%m-%d')"/>
+            <field name="state">draft</field>
+            <field name="responsible_id" ref="res_users_userdesign0"/>
+            <field eval="20.0" name="duration"/>
+            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
+            <field name="constraint_date_start" eval="(DateTime.now()+timedelta(25-70)).strftime('%Y-%m-%d')"/>
+            <field name="date_end" eval="(DateTime.now()+timedelta(40-70)).strftime('%Y-%m-%d')"/>
+        </record>
+
+        <record id="project_phase_developmentintegrationandtesting0" model="project.phase">
+            <field eval="[(6, 0, [ref('project_phase_webdesign0')])]" name="previous_phase_ids"/>
+            <field name="name">Development, Integration and Testing</field>
+            <field name="product_uom" ref="product.uom_day"/>
+            <field eval="10" name="sequence"/>
+            <field name="constraint_date_end" eval="(DateTime.now()+timedelta(57-70)).strftime('%Y-%m-%d')"/>
+            <field name="date_start" eval="(DateTime.now()+timedelta(30-70)).strftime('%Y-%m-%d')"/>
+            <field name="state">draft</field>
+            <field name="responsible_id" ref="res_users_manager0"/>
+            <field eval="22.0" name="duration"/>
+            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
+            <field name="constraint_date_start" eval="(DateTime.now()+timedelta(35-70)).strftime('%Y-%m-%d')"/>
+            <field name="date_end" eval="(DateTime.now()+timedelta(52-70)).strftime('%Y-%m-%d')"/>
         </record>
 
         <record id="project_phase_websitedeployment0" model="project.phase">
-            <field eval="[(6, 0, [ref('project_phase_informationgatheringandunderstanding0'), ref('project_phase_planning0'), ref('project_phase_webdesign0'), ref('project_phase_developmentintegrationandtesting0')])]" name="previous_phase_ids"/>
+            <field eval="[(6, 0, [ref('project_phase_developmentintegrationandtesting0')])]" name="previous_phase_ids"/>
             <field name="name">Website Deployment</field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="10" name="sequence"/>
-            <field name="constraint_date_end">2010-04-30 16:35:00</field>
-            <field name="date_start">2010-04-26 16:35:00</field>
+            <field name="constraint_date_end" eval="(DateTime.now()+timedelta(63-70)).strftime('%Y-%m-%d')"/>
+            <field name="date_start" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d')"/>
             <field name="state">draft</field>
             <field name="responsible_id" ref="res_users_manager0"/>
-            <field eval="2.0" name="duration"/>
+            <field eval="5.0" name="duration"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field name="constraint_date_start">2010-03-10 16:35:00</field>
-            <field name="date_end">2010-04-27 16:34:00</field>
+            <field name="constraint_date_start" eval="(DateTime.now()+timedelta(58-70)).strftime('%Y-%m-%d')"/>
+            <field name="date_end" eval="(DateTime.now()+timedelta(60-70)).strftime('%Y-%m-%d')"/>
         </record>
 
         <!--  Project Resource Allocation -->
@@ -396,11 +396,11 @@
 
         <!-- Tasks -->
         <record id="project_task_preparerequirementsdocument0" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field name="date_end">2010-03-02 11:00:00</field>
-            <field eval="24.0" name="planned_hours"/>
+            <field eval="15" name="sequence"/>
+            <field eval="100.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_user0"/>
-            <field name="date_start">2010-02-24 05:00:00</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()-timedelta(70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -408,17 +408,18 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Prepare Requirements Document</field>
-            <field name="date_deadline">2010-03-08</field>
-            <field eval="24.0" name="total_hours"/>
-            <field eval="24.0" name="remaining_hours"/>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field eval="100.0" name="total_hours"/>
+            <field eval="100.0" name="remaining_hours"/>
             <field name="phase_id" ref="project_phase_informationgatheringandunderstanding0"/>
         </record>
 
         <record id="project_task_definewebsitegoalspurposesandtargetaudience0" model="project.task">
             <field eval="10" name="sequence"/>
-            <field eval="65.0" name="planned_hours"/>
+            <field eval="80.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_useranalyst0"/>
-            <field name="date_start">2010-02-25 15:38:08</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()-timedelta(70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -426,17 +427,18 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Define Website Goals, Purposes and Target Audience</field>
-            <field name="date_deadline">2010-03-04</field>
-            <field eval="65.0" name="total_hours"/>
-            <field eval="65.0" name="remaining_hours"/>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(10-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field eval="80.0" name="total_hours"/>
+            <field eval="80.0" name="remaining_hours"/>
             <field name="phase_id" ref="project_phase_informationgatheringandunderstanding0"/>
         </record>
 
         <record id="project_task_usecases0" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field eval="16.0" name="planned_hours"/>
+            <field eval="17" name="sequence"/>
+            <field eval="40.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_userdesign0"/>
-            <field name="date_start">2010-02-25 15:42:42</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(48-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -444,9 +446,9 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Use Cases</field>
-            <field name="date_deadline">2010-03-10</field>
-            <field eval="16.0" name="total_hours"/>
-            <field eval="16.0" name="remaining_hours"/>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field eval="40.0" name="total_hours"/>
+            <field eval="40.0" name="remaining_hours"/>
             <field name="phase_id" ref="project_phase_informationgatheringandunderstanding0"/>
         </record>
 
@@ -454,7 +456,8 @@
             <field eval="10" name="sequence"/>
             <field eval="25.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_userfinance0"/>
-            <field name="date_start">2010-02-25 15:51:00</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(10-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -462,7 +465,7 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Budget Planning</field>
-            <field name="date_deadline">2010-03-31</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(18-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="25.0" name="total_hours"/>
             <field eval="25.0" name="remaining_hours"/>
             <field name="phase_id" ref="project_phase_planning0"/>
@@ -472,7 +475,8 @@
             <field eval="10" name="sequence"/>
             <field eval="25.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_user0"/>
-            <field name="date_start">2010-02-25 15:54:42</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(10-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -480,7 +484,7 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Quality Planning</field>
-            <field name="date_deadline">2010-03-31</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(18-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="25.0" name="total_hours"/>
             <field eval="25.0" name="remaining_hours"/>
             <field name="phase_id" ref="project_phase_planning0"/>
@@ -490,7 +494,8 @@
             <field eval="10" name="sequence"/>
             <field eval="20.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_user1"/>
-            <field name="date_start">2010-02-25 15:55:11</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(13-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -498,7 +503,7 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Risk Management Planning</field>
-            <field name="date_deadline">2010-03-31</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(20-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="20.0" name="total_hours"/>
             <field eval="20.0" name="remaining_hours"/>
             <field name="phase_id" ref="project_phase_planning0"/>
@@ -508,7 +513,8 @@
             <field eval="10" name="sequence"/>
             <field eval="30.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_manager0"/>
-            <field name="date_start">2010-02-25 15:57:48</field>
+			<field name="state">open</field>            
+            <field name="date_start" eval="(DateTime.now()+timedelta(20-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -516,7 +522,7 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Create Project Schedules</field>
-            <field name="date_deadline">2010-03-31</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(25-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="30.0" name="total_hours"/>
             <field eval="30.0" name="remaining_hours"/>
             <field name="phase_id" ref="project_phase_planning0"/>
@@ -526,7 +532,8 @@
             <field eval="10" name="sequence"/>
             <field eval="10.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_manager0"/>
-            <field name="date_start">2010-02-25 16:04:16</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(20-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -534,7 +541,7 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Dataflow Design</field>
-            <field name="date_deadline">2010-04-02</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(23-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="10.0" name="total_hours"/>
             <field eval="10.0" name="remaining_hours"/>
             <field name="phase_id" ref="project_phase_webdesign0"/>
@@ -544,7 +551,8 @@
             <field eval="10" name="sequence"/>
             <field eval="50.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_userdesign0"/>
-            <field name="date_start">2010-02-25 16:05:43</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(22-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -552,9 +560,9 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">User Interface Design</field>
-            <field name="date_deadline">2010-04-10</field>
-            <field eval="50.0" name="total_hours"/>
-            <field eval="50.0" name="remaining_hours"/>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(40-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field eval="150.0" name="total_hours"/>
+            <field eval="150.0" name="remaining_hours"/>
             <field name="phase_id" ref="project_phase_webdesign0"/>
         </record>
 
@@ -562,7 +570,8 @@
             <field eval="10" name="sequence"/>
             <field eval="40.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_userdesign0"/>
-            <field name="date_start">2010-02-25 16:06:52</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(30-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -570,7 +579,7 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Task Level WBS</field>
-            <field name="date_deadline">2010-04-07</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(40-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="40.0" name="total_hours"/>
             <field eval="40.0" name="remaining_hours"/>
             <field name="phase_id" ref="project_phase_webdesign0"/>
@@ -580,7 +589,8 @@
             <field eval="10" name="sequence"/>
             <field eval="90.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_userdeveloper0"/>
-            <field name="date_start">2010-02-25 16:11:40</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(30-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -588,16 +598,18 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Modular Programming</field>
-            <field name="date_deadline">2010-04-22</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(50-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="90.0" name="total_hours"/>
             <field eval="90.0" name="remaining_hours"/>
+            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
         </record>
 
         <record id="project_task_integratemodules0" model="project.task">
             <field eval="10" name="sequence"/>
             <field eval="20.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_userdeveloper1"/>
-            <field name="date_start">2010-02-25 16:13:10</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(45-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -605,16 +617,18 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Integrate Modules</field>
-            <field name="date_deadline">2010-04-24</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(53-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="20.0" name="total_hours"/>
             <field eval="20.0" name="remaining_hours"/>
+            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
         </record>
 
         <record id="project_task_unittesting0" model="project.task">
             <field eval="10" name="sequence"/>
-            <field eval="30.0" name="planned_hours"/>
+            <field eval="50.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_usertester0"/>
-            <field name="date_start">2010-02-25 16:14:32</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(40-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -622,16 +636,18 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Unit Testing</field>
-            <field name="date_deadline">2010-04-24</field>
-            <field eval="30.0" name="total_hours"/>
-            <field eval="30.0" name="remaining_hours"/>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field eval="50.0" name="total_hours"/>
+            <field eval="50.0" name="remaining_hours"/>
+            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
         </record>
 
         <record id="project_task_regressiontest0" model="project.task">
             <field eval="10" name="sequence"/>
             <field eval="30.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_usertester0"/>
-            <field name="date_start">2010-02-25 16:15:38</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(40-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -639,16 +655,18 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Regression Test</field>
-            <field name="date_deadline">2010-04-24</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="30.0" name="total_hours"/>
             <field eval="30.0" name="remaining_hours"/>
+            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
         </record>
 
         <record id="project_task_documentation0" model="project.task">
             <field eval="10" name="sequence"/>
             <field eval="15.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_demouser1"/>
-            <field name="date_start">2010-02-25 16:17:04</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(40-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -656,16 +674,18 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Documentation</field>
-            <field name="date_deadline">2010-04-24</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="15.0" name="total_hours"/>
             <field eval="15.0" name="remaining_hours"/>
+            <field name="phase_id" ref="project_phase_websitedeployment0"/>
         </record>
 
         <record id="project_task_performancetuning0" model="project.task">
             <field eval="10" name="sequence"/>
             <field eval="40.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_usertester1"/>
-            <field name="date_start">2010-02-25 16:17:42</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(45-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -673,16 +693,18 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Performance Tuning</field>
-            <field name="date_deadline">2010-04-24</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="40.0" name="total_hours"/>
             <field eval="40.0" name="remaining_hours"/>
+            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
         </record>
 
         <record id="project_task_deploywebsite0" model="project.task">
             <field eval="10" name="sequence"/>
             <field eval="5.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_userdeveloper0"/>
-            <field name="date_start">2010-02-25 16:21:15</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
@@ -690,171 +712,29 @@
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Deploy Website</field>
-            <field name="date_deadline">2010-04-26</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(60-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="5.0" name="total_hours"/>
             <field eval="5.0" name="remaining_hours"/>
+            <field name="phase_id" ref="project_phase_websitedeployment0"/>
         </record>
 
         <record id="project_task_presentation0" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field eval="5.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_demouser1"/>
-            <field name="date_start">2010-02-25 16:22:09</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Presentation</field>
-            <field name="date_deadline">2010-04-28</field>
-            <field eval="5.0" name="total_hours"/>
-            <field eval="5.0" name="remaining_hours"/>
-        </record>
-
-        <record id="project_task_deployment0" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field eval="5.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_userdeveloper0"/>
-            <field name="date_start">2010-02-25 16:36:02</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Deployment</field>
-            <field name="date_deadline">2010-04-28</field>
-            <field eval="5.0" name="total_hours"/>
-            <field eval="5.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_websitedeployment0"/>
-        </record>
-
-        <record id="project_task_presentation1" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field eval="5.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_demouser1"/>
-            <field name="date_start">2010-02-25 16:36:43</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Presentation</field>
-            <field name="date_deadline">2010-04-29</field>
-            <field eval="5.0" name="total_hours"/>
-            <field eval="5.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_websitedeployment0"/>
-        </record>
-
-        <record id="project_task_modulesintegration0" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field eval="20.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_userdeveloper1"/>
-            <field name="date_start">2010-02-25 17:22:46</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Modules Integration</field>
-            <field name="date_deadline">2010-04-24</field>
-            <field eval="20.0" name="total_hours"/>
-            <field eval="20.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
-        </record>
-
-        <record id="project_task_unittesting1" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field eval="30.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_usertester0"/>
-            <field name="date_start">2010-02-25 17:34:32</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Unit Testing</field>
-            <field name="date_deadline">2010-04-24</field>
-            <field eval="30.0" name="total_hours"/>
-            <field eval="30.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
-        </record>
-
-        <record id="project_task_modulartesting0" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field eval="20.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_userdeveloper1"/>
-            <field name="date_start">2010-02-25 17:35:46</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Modular Testing</field>
-            <field name="date_deadline">2010-04-24</field>
-            <field eval="20.0" name="total_hours"/>
-            <field eval="20.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
-        </record>
-
-        <record id="project_task_documentation1" model="project.task">
             <field eval="10" name="sequence"/>
             <field eval="10.0" name="planned_hours"/>
             <field name="user_id" ref="res_users_demouser1"/>
-            <field name="date_start">2010-02-25 17:36:27</field>
+            <field name="state">open</field>
+            <field name="date_start" eval="(DateTime.now()+timedelta(58-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6, 0, [])]" name="child_ids"/>
             <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
-            <field name="name">Documentation</field>
-            <field name="date_deadline">2010-04-28</field>
+            <field name="name">Presentation</field>
+            <field name="date_deadline" eval="(DateTime.now()+timedelta(65-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field eval="10.0" name="total_hours"/>
             <field eval="10.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
-        </record>
-
-        <record id="project_task_performancetuning1" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field eval="30.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_usertester1"/>
-            <field name="date_start">2010-02-25 17:37:03</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Performance Tuning</field>
-            <field name="date_deadline">2010-04-27</field>
-            <field eval="30.0" name="total_hours"/>
-            <field eval="30.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
-        </record>
-
-        <record id="project_task_modularprogramming1" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field name="date_end">2010-03-12 18:00:00</field>
-            <field eval="100.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_userdeveloper0"/>
-            <field name="date_start">2010-03-01 12:00:00</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Modular Programming</field>
-            <field name="date_deadline">2010-04-22</field>
-            <field eval="100.0" name="total_hours"/>
-            <field eval="100.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
+            <field name="phase_id" ref="project_phase_websitedeployment0"/>
         </record>
 
     </data>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 4170c0064d0..7d51f79530a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -8,6 +8,20 @@
     # Project Resource Allocation
     # ------------------------------------------------------
 
+        <record id="view_project_resource_allocation_gantt" model="ir.ui.view">
+            <field name="name">project.resource.allocation.gantt</field>
+            <field name="model">project.resource.allocation</field>
+            <field name="type">gantt</field>
+            <field name="arch" type="xml">
+              <gantt color="phase_id" date_start="phase_id_date_start" date_stop="phase_id_date_end" string="R.A.">
+               <level object="project.resource" link="resource_id" domain="[]">
+                   <field name="useability"/>
+                </level>
+              </gantt>
+            </field>
+        </record>
+
+
         <record id="view_project_resource_allocation_form" model="ir.ui.view">
             <field name="name">project.resource.allocation.form</field>
             <field name="model">project.resource.allocation</field>
@@ -58,8 +72,8 @@
             <field name="name">Resource Allocations</field>
             <field name="res_model">project.resource.allocation</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-             <field name="context">{'search_default_resource': 1} </field>
+            <field name="view_mode">gantt,tree,form</field>
+             <field name="context">{}</field>
             <!--<field name="search_view_id" ref="view_project_phase_search"/>-->
         </record>
 
@@ -243,8 +257,9 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
-             <field name="context">{'search_default_responsible_id':uid}</field>
+            <field name="context">{'search_default_responsible_id':uid}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
+            <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>            
         </record>
 
         <record id="act_project_phase_list" model="ir.actions.act_window">
diff --git a/addons/project_long_term/test/schedule_phase_tasks.yml b/addons/project_long_term/test/schedule_phase_tasks.yml
index 7af72f05824..92286700e6c 100644
--- a/addons/project_long_term/test/schedule_phase_tasks.yml
+++ b/addons/project_long_term/test/schedule_phase_tasks.yml
@@ -16,7 +16,7 @@
   Create phase 'Develop GUI' in Outlook
 - 
   !record {model: project.phase, id: project_phase_phase0}:
-    date_start: '2010-06-02 00:00:00'
+    date_start: '2010-06-02'
     duration: 200.0
     name: phase123
     product_uom: product.uom_day
@@ -36,7 +36,6 @@
 - 
   !record {model: project.task, id: project_task_t0}:
     name: t1
-    occupation_rate: 1.0
     planned_hours: 20.0
     remaining_hours: 20.0
     state: draft
@@ -49,7 +48,6 @@
 - 
   !record {model: project.task, id: project_task_t1}:
     name: t2
-    occupation_rate: 1.0
     planned_hours: 25.0
     remaining_hours: 25.0
     state: draft
@@ -61,7 +59,6 @@
 - 
   !record {model: project.task, id: project_task_t2}:
     name: t3
-    occupation_rate: 1.0
     planned_hours: 30.0
     remaining_hours: 30.0
     state: draft
@@ -74,7 +71,6 @@
 - 
   !record {model: project.task, id: project_task_3}:
     name: t4
-    occupation_rate: 1.0
     planned_hours: 25.0
     remaining_hours: 25.0
     state: draft
diff --git a/addons/project_long_term/test/schedule_project_phases.yml b/addons/project_long_term/test/schedule_project_phases.yml
index 470f2dc2e48..7f59b476c65 100644
--- a/addons/project_long_term/test/schedule_project_phases.yml
+++ b/addons/project_long_term/test/schedule_project_phases.yml
@@ -10,7 +10,7 @@
   Create a project phase 'Defining Client's Basic Idea of Project'
 - 
   !record {model: project.phase, id: project_phase_definingclientsbasicideaofproject0}:
-    date_start: '2010-06-02 00:00:00'
+    date_start: '2010-06-02'
     duration: 15.0
     name: "Defining Client's Basic Idea of Project"
     product_uom: product.uom_day
@@ -22,7 +22,7 @@
   Create project phase 'Establishing Project Feasibility'
 - 
   !record {model: project.phase, id: project_phase_establishingprojectfeasibility0}:
-    date_start: '2010-06-02 00:00:00'
+    date_start: '2010-06-02'
     duration: 30.0
     name: Establishing Project Feasibility
     product_uom: product.uom_day
@@ -33,7 +33,7 @@
   Create project phase 'Preparation of Engineering Designs'
 - 
   !record {model: project.phase, id: project_phase_preparationofengineeringdesigns0}:
-    date_start: '2010-06-02 00:00:00'
+    date_start: '2010-06-02'
     duration: 100.0
     name: Preparation of Engineering Designs
     product_uom: product.uom_hour
@@ -45,7 +45,7 @@
   Create project phase 'Procurement of Works and Goods'
 - 
   !record {model: project.phase, id: project_phase_procurementofworksandgoods0}:
-    date_start: '2010-06-02 00:00:00'
+    date_start: '2010-06-02'
     duration: 24.0
     name: Procurement of Works and Goods
     product_uom: product.uom_hour
@@ -57,7 +57,7 @@
   Create project phase 'Project Construction'
 - 
   !record {model: project.phase, id: project_phase_projectconstruction0}:
-    date_start: '2010-06-02 00:00:00'
+    date_start: '2010-06-02'
     duration: 4320.0
     name: Project Construction
     product_uom: product.uom_hour
@@ -69,7 +69,7 @@
   Create project phase 'Project Completion'
 - 
   !record {model: project.phase, id: project_phase_projectcompletion0}:
-    date_start: '2010-06-02 00:00:00'
+    date_start: '2010-06-02'
     duration: 240.0
     name: Project Completion
     product_uom: product.uom_hour
diff --git a/addons/project_long_term/test/schedule_project_tasks.yml b/addons/project_long_term/test/schedule_project_tasks.yml
index 40dbd07b3ff..012898b9860 100644
--- a/addons/project_long_term/test/schedule_project_tasks.yml
+++ b/addons/project_long_term/test/schedule_project_tasks.yml
@@ -17,7 +17,7 @@
   Create phase 'Develop GUI' in Thunderbird
 - 
   !record {model: project.phase, id: project_phase_phase1}:
-    date_start: '2010-06-02 00:00:00'
+    date_start: '2010-06-02'
     duration: 100.0
     name: phase22
     product_uom: product.uom_day
@@ -37,7 +37,6 @@
 - 
   !record {model: project.task, id: project_task_t00}:
     name: t1
-    occupation_rate: 1.0
     planned_hours: 20.0
     remaining_hours: 20.0
     state: draft
@@ -50,7 +49,6 @@
 - 
   !record {model: project.task, id: project_task_t11}:
     name: t2
-    occupation_rate: 1.0
     planned_hours: 25.0
     remaining_hours: 25.0
     state: draft
@@ -62,7 +60,6 @@
 - 
   !record {model: project.task, id: project_task_t22}:
     name: t3
-    occupation_rate: 1.0
     planned_hours: 30.0
     remaining_hours: 30.0
     state: draft
@@ -75,7 +72,6 @@
 - 
   !record {model: project.task, id: project_task_t33}:
     name: t4
-    occupation_rate: 1.0
     planned_hours: 25.0
     remaining_hours: 25.0
     state: draft
@@ -105,4 +101,4 @@
      prj=self.browse(cr, uid, [ref("project_project_project1")])[0]
      for task in prj.tasks:
      	if (not task.user_id) or (not task.date_start) or (not task.date_end):
-     	   raise AssertionError("Project Tasks not scheduled")
\ No newline at end of file
+     	   raise AssertionError("Project Tasks not scheduled")
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index bc377a5af7d..e13d307aab2 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -103,20 +103,20 @@ class project_compute_phases(osv.osv_memory):
             # Recalculate date_start and date_end
             # according to constraints on date start and date end on phase
             if phase.constraint_date_start and str(s_date) < phase.constraint_date_start:
-                start_date = datetime.datetime.strptime(phase.constraint_date_start, '%Y-%m-%d %H:%M:%S')
+                start_date = datetime.datetime.strptime(phase.constraint_date_start, '%Y-%m-%d')
             else:
                 start_date = s_date
             if phase.constraint_date_end and str(e_date) > phase.constraint_date_end:
-                end_date= datetime.datetime.strptime(phase.constraint_date_end, '%Y-%m-%d %H:%M:%S')
-                date_start = phase.constraint_date_end[:-3]
+                end_date= datetime.datetime.strptime(phase.constraint_date_end, '%Y-%m-%d')
+                date_start = phase.constraint_date_end
             else:
                 end_date = e_date
                 date_start = end_date
             # Write the calculated dates back
             ctx = context.copy()
             ctx.update({'scheduler': True})
-            phase_obj.write(cr, uid, [phase.id], {'date_start': start_date.strftime('%Y-%m-%d %H:%M:%S'),
-                                                  'date_end': end_date.strftime('%Y-%m-%d %H:%M:%S')},
+            phase_obj.write(cr, uid, [phase.id], {'date_start': start_date.strftime('%Y-%m-%d'),
+                                                  'date_end': end_date.strftime('%Y-%m-%d')},
                                                    context=ctx)
             # Recursive call till all the next phases scheduled
             for phase in phase.next_phase_ids:
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 8a9ce15e772..3895b0cc4c8 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -37,6 +37,8 @@
 	           <field name="view_id" ref="view_project_compute_phases_select"/>
 		       <field name="context">{'record_id': active_id}</field>
 	           <field name="target">new</field>
+	           <field name="help">To schedule phases of all or a specified project. It then open a gantt view.
+	           </field>
     	</record>
 
  		<menuitem id="menu_compute_phase" name="Compute Phase Scheduling"
diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py
index d3c42a983d0..df9f1aae7d4 100644
--- a/addons/project_long_term/wizard/project_schedule_tasks.py
+++ b/addons/project_long_term/wizard/project_schedule_tasks.py
@@ -92,7 +92,7 @@ class project_schedule_task(osv.osv_memory):
         if task_ids:
             task_ids.sort()
             tasks = task_obj.browse(cr, uid, task_ids, context=context)
-            start_date = str(phase.date_start)[:-9]
+            start_date = str(phase.date_start)
             if not phase.date_start:
                 if not phase.project_id.date_start:
                     start_date = datetime.datetime.now().strftime("%Y-%m-%d")
diff --git a/addons/project_long_term/wizard/working_calendar.py b/addons/project_long_term/wizard/working_calendar.py
index d52bd54b437..1de7e717502 100644
--- a/addons/project_long_term/wizard/working_calendar.py
+++ b/addons/project_long_term/wizard/working_calendar.py
@@ -81,7 +81,7 @@ def compute_working_calendar(cr, uid, calendar_id, context=None):
        """
 
         pool = pooler.get_pool(cr.dbname)
-        resource_week_obj = pool.get('resource.calendar.week')
+        resource_attendance_obj = pool.get('resource.calendar.attendance')
         time_range = "8:00-8:00"
         non_working = ""
         week_days = {"0": "mon", "1": "tue", "2": "wed","3": "thu", "4": "fri", "5": "sat", "6": "sun"}
@@ -89,8 +89,8 @@ def compute_working_calendar(cr, uid, calendar_id, context=None):
         wk_time = {}
         wktime_list = []
         wktime_cal = []
-        week_ids = resource_week_obj.search(cr, uid, [('calendar_id', '=', calendar_id)], context=context)
-        weeks = resource_week_obj.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'], context=context)
+        week_ids = resource_attendance_obj.search(cr, uid, [('calendar_id', '=', calendar_id)], context=context)
+        weeks = resource_attendance_obj.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'], context=context)
         # Convert time formats into appropriate format required
         # and create a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
         for week in weeks:
diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index 6127533e9c5..473bb6325e8 100644
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -24,7 +24,7 @@
     "name": "In-Project Messaging System",
     "version": "1.0",
     "depends": ["project"],
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "description": """
     This module provides the functionality to send messages within a project.
     A user can send messages individually to other user. He can even broadcast
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 2ac983e67e4..7ca37e87d13 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -45,7 +45,7 @@ This module is useful to be able to invoice services based on tasks
 automatically created via sale orders.
 
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['project', 'procurement', 'sale', 'mrp_jit'],
     'init_xml': [],
diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
index 74c1a3fcabe..330a2e2b0c7 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -36,7 +36,7 @@ So that, each department manager can know if someone in his team has still unall
 
 At the end of the month, the planning manager can also check if the encoded timesheets are respecting the planned time on each analytic account.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': [
         'project',
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 69dfde4e6bf..e248fe1c050 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -214,8 +214,8 @@ class project_task(osv.osv):
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         if not context:
-            context = context
-        if not context.get('planning'):
+            context = {}
+        if not context.get('planning', False):
             return super(project_task,self).search(cr, user, args, offset, limit, order, context)
         cr.execute(" SELECT t.id, t.name \
                         from project_task t \
@@ -498,7 +498,7 @@ class report_account_analytic_planning_stat(osv.osv):
 WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.id, line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
             else:
                 cr.execute('SELECT sum(unit_amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s', (line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
-                
+
         sum = cr.fetchone()
         if sum and sum[0]:
             result[line.id] = sum[0] * div2
@@ -529,7 +529,7 @@ WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
                     project_task
                 WHERE
                 ''' + where + '''
-                    project_id IN (select id from project_project where category_id=%s) AND
+                    project_id IN (select id from project_project where analytic_account_id=%s) AND
                     date_end>=%s AND
                     date_end<=%s''', (
                 line.account_id.id,
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index fff11703de5..b72aa69c011 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -87,7 +87,7 @@
                                         <form string="Tasks">
                                                 <group colspan="4" col="2">
                                                 <field name="name" select="1"/>
-                                                <field name="project_id" required="1" select="1" domain="[('category_id','=',parent.account_id)]"/>
+                                                <field name="project_id" required="1" select="1" domain="[('analytic_account_id','=',parent.account_id)]"/>
                                             </group>
                                             <group colspan="4" col="4">
                                                 <field name="date_deadline"/>
@@ -123,7 +123,7 @@
                                                         <field name="sequence"/>
                                                     </group>
                                                 <separator string="Miscelleanous" colspan="4"/>
-                                                    <field name="type"/>
+                                                    <field name="type_id"/>
                                                     <field name="active"/>
                                                     <field name="partner_id"/>
                                                     <separator colspan="4" string="Notes"/>
@@ -216,6 +216,7 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="account_analytic_planning_view_search"/>
+            <field name="help">With its commun system for scheduling all resources of a company (people and materials), OpenERP allows you to encode then compute automatically tasks and phases scheduling, track resources allocation and availibility.</field>
         </record>
 <!--        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>-->
         <menuitem id="base.menu_project_long_term" name="Long Term Planning"
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index aa0b106bbad..a9ba0a1111a 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -26,7 +26,7 @@
     'description': """
         - If deadline date of project is changed
           then the deadline date for all the tasks will change to the same  """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base', 'project'],
     'init_xml': [],
     'update_xml': [],
diff --git a/addons/scrum/__init__.py b/addons/project_scrum/__init__.py
similarity index 96%
rename from addons/scrum/__init__.py
rename to addons/project_scrum/__init__.py
index 204f3abd3f8..ab85f618822 100644
--- a/addons/scrum/__init__.py
+++ b/addons/project_scrum/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,11 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import scrum
+import project_scrum
 import report
 import wizard
 
diff --git a/addons/scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
similarity index 84%
rename from addons/scrum/__openerp__.py
rename to addons/project_scrum/__openerp__.py
index ef552090c67..847263ba7d3 100644
--- a/addons/scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -46,22 +46,21 @@
     More information on the methodology:
     * http://controlchaos.com
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['project', 'process'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
-        'scrum_report.xml',
-        'wizard/scrum_backlog_create_task_view.xml',
-        'scrum_view.xml',
-        'process/scrum_process.xml',
-        'wizard/scrum_backlog_sprint_view.xml',
-        'wizard/scrum_backlog_merger_view.xml',
-        "board_scrum_view.xml",
+        'project_scrum_report.xml',
+        'wizard/project_scrum_backlog_create_task_view.xml',
+        'project_scrum_view.xml',
+        'process/project_scrum_process.xml',
+        'wizard/project_scrum_backlog_sprint_view.xml',
+        'wizard/project_scrum_backlog_merger_view.xml',
+        "board_project_scrum_view.xml",
     ],
-    'demo_xml': ['scrum_demo.xml'],
+    'demo_xml': ['project_scrum_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '0084121063261',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/scrum/board_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
similarity index 86%
rename from addons/scrum/board_scrum_view.xml
rename to addons/project_scrum/board_project_scrum_view.xml
index 5184aefa79c..f0a29ffe7e4 100644
--- a/addons/scrum/board_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
             <record id="view_scrum_sprint_dashboard_tree" model="ir.ui.view">
-            <field name="name">scrum.sprint.dashboard.tree</field>
-            <field name="model">scrum.sprint</field>
+            <field name="name">project.scrum.sprint.dashboard.tree</field>
+            <field name="model">project.scrum.sprint</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
             	 <tree string="Scrum Sprint">
@@ -14,21 +14,21 @@
                     <field name="date_start"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="effective_hours" sum="Effective hours" widget="float_time"/>
-                    <field name="planned_hours" sum="Planned hours" widget="float_time"/>
+                    <!-- field name="planned_hours" sum="Planned hours" widget="float_time"/> -->
                     <field name="expected_hours" sum="Expected hours" widget="float_time"/>
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                     <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
-                	<button name="%(scrum.report_scrum_sprint_burndown_chart)d" states="open,draft,close,cancel"
+                	<button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" states="open,draft,close,cancel"
                                 	string="Burndown Chart" type="action" icon="gtk-print"/>
              	</tree>
             </field>
         </record>
         <record id="action_sprint_all_dashboard_tree" model="ir.actions.act_window">
             <field name="name">Sprint's List</field>
-            <field name="res_model">scrum.sprint</field>
+            <field name="res_model">project.scrum.sprint</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_scrum_sprint_dashboard_tree"/>
@@ -58,6 +58,6 @@
         <menuitem
             id="menu_deshboard_scurm"
             name="Scrum Dashboard" parent="project.next_id_86"
-            icon="terp-graph" action="open_board_project_scrum"/>
+            action="open_board_project_scrum"/>
     </data>
 </openerp>
diff --git a/addons/project_scrum/i18n/ar.po b/addons/project_scrum/i18n/ar.po
new file mode 100644
index 00000000000..5d5fb6f9c2e
--- /dev/null
+++ b/addons/project_scrum/i18n/ar.po
@@ -0,0 +1,893 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: field:scrum.team,name:0
+msgid "Team Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:scrum.team,users_id:0
+msgid "Users"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/bg.po b/addons/project_scrum/i18n/bg.po
new file mode 100644
index 00000000000..65094bfdb6a
--- /dev/null
+++ b/addons/project_scrum/i18n/bg.po
@@ -0,0 +1,910 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "Име на среща"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr "Създай задача от \"недовършено\""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Мои задачи"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Напредък"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Общо оставащо време, може да бъре преоценявано периодично от пълномощника на "
+"задачата."
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Подпроект"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr "Какво сте свършили от вчера до днес ?"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr "Членове на проекта"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Делегирани задачи"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Хедер, който се добавя в началото на имейла с предупредително съобщение към "
+"клиента, когато дадена задача е приключена."
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Важност"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+"Член на проекта. Не се използва в каквито и да е изчисления, а само с "
+"информационна цел."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Много спешно"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Очаквано време за приключване на задачата, обикновено се задава от "
+"ръководителят на проекта когато задачата е в състояние на чернова."
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Бележки"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Проект"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+"Ако изберете това поле, ръководителят на проекта ще получава запитване при "
+"всяко приключване на задача от неговия екип."
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Отказани"
+
+#. module: project_scrum
+#: field:scrum.team,name:0
+msgid "Team Name"
+msgstr "Име на екип"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr "Хедер на писмо"
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Крайна дата"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Аналитична сметка"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Всички задачи"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Краен срок"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "Партньор"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Планирани часове"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "Шаблон"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Важност"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "Състояние"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr "Вътрешно описание на проекта."
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "Изчислено по: Изтекло време + Оставащо време."
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Вид"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Средно"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "Общо време"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Планирано време"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Задачи за днес"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Задачи от вчера"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Начална дата"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Проекти"
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Невалиден XML за преглед на архитектурата"
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Подробности на задачата"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "Прегледай задачите на проекта"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Часове забавяне"
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Контакт"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "Дата на среща"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Задачи"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Създадени задачи"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "Напредък (%)"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Изчислено по: Изтекло време / Общо време"
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "Отворени задачи"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr "Незадължителна информация"
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr "Сбор на всички часове по всички задачи свързани с този проект."
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "Преглед"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Бележка"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Чернова"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Нисък"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Мои отворени задачи"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr "Ръководител на проект"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "Висящи"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr "Има ли нещо което да ви пречи ?"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Състояние"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "Отнето време"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "Име на проект"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Собственик на продукта"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Потребител"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Активен"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+"Изчислено по: Общо време - Очаквано време. Това дава разликата между "
+"очакваното време от ръководителят на проекта и реалното време за приключване "
+"на задачата."
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "Работно време"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "Работата завършена"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Делегирано на"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Дата на приключване"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Назначено на"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr "Сума на отнетите часове по всички задачи свързани с този роект."
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+"Ако имате [?] в името на проекта, това означава че няма свързана аналитична "
+"сметка към този проект."
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr "Сума на планираните часове по всички задачи свързани с този проект."
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Уведомяване на партньор"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "Резюме на задача"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Готово"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Отказ"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "Отвoри"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "Ефективни часове"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr "Уведомяване на ръководител"
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "Изпълнява се"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Оставащи часове"
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "Родителска задача"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Възможност"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Много ниско"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Планирани часове"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "Редактиране на проекти"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Описание"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Спешно"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Ежедневни срещи"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "Върху какво работите днес ?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr "Изпълнява се"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Напредък"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "Родителски проект"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Подробности за задачите"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "Отнети часове"
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Контекст"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr "Общо часове"
+
+#. module: project_scrum
+#: field:scrum.team,users_id:0
+msgid "Users"
+msgstr "Потребители"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Последователност"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Създадени задачи"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Възложи на"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr "Очакван край"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/bs.po b/addons/project_scrum/i18n/bs.po
new file mode 100644
index 00000000000..684c099c4e3
--- /dev/null
+++ b/addons/project_scrum/i18n/bs.po
@@ -0,0 +1,894 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07: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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Moji zadaci"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Napredak"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr "Članovi Projekta"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Delegirani Zadaci"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Važnost"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Vrlo hitno"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Bilješke"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Projekat"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Poništeno"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Naziv Tima"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Završni Datum"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Svi Zadaci"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Rok izvršenja"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Planirani Sati"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "Šablon"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Prioritet"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr "Interni opis projekta."
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Vrsta"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Srednji"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "Ukupno Vrijeme"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Planirano Vrijeme"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Današnji zadaci"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Zadaci od jučer"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Početni Datum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Projekti"
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Detalji Zadataka"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "Pogledaj zadatke projekta"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Zadaci"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Kreiraj Zadatke"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "Napredak (%)"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "Otvoreni zadaci"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "Pregled"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Zabilješka"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Skica"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Nizak"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Moji otvoreni zadaci"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "Potrošeno Vrijeme"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "Naziv Projekta"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Vlasnik Proizvoda"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Aktivan"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "Radno Vrijeme"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Dodijeljen"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Upozori Partnera"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "U Toku"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Preostali Sati"
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Vrlo Nisko"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Planirani sati"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Hitno"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Dnevni Sastanci"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "Na čemu radiš danas?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Progres (0-100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Detalji Zadataka"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "Potrošeni Sati"
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Kontekst"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr "Ukupno Sati"
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Korisnici"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Kreirani zadaci"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Dodijeli"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr "Očekivani Kraj"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/ca.po b/addons/project_scrum/i18n/ca.po
new file mode 100644
index 00000000000..cde5d7b6057
--- /dev/null
+++ b/addons/project_scrum/i18n/ca.po
@@ -0,0 +1,926 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr "Scrum backlog del producte"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "Nom de reunió"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr "Des de backlog crea tasca."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Les meves tasques"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr "Els meus sprints oberts (responsable de producte)"
+
+#. module: project_scrum
+#: model:process.node,note:project_scrum.process_node_productbacklog0
+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"
+msgstr "Scrum, mètode de desenvolupament àgil"
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Progrés"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Total temps restant, pot ser reestimat periòdicament per qui se li ha "
+"assignat la tasca."
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Subprojecte"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr "Què heu aconseguit des d'ahir?"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr "És exacta la vostra estimació del sprint backlog?"
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr "Membres del projecte"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr "Projectes scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Tasques delegades"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Capçalera afegida al principi del correu electrònic del missatge d'avís "
+"enviat al client quan es tanca una tasca."
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Importància"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr "Tasca scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr "Vista backlogs del projecte"
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+"Membres del projecte. No utilitzat en cap càlcul, només per tal d'informar."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Molt urgent"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr "Sprint retrospectiu"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "Nom del sprint"
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Temps estimat per a realitzar la tasca, normalment fixat pel responsable del "
+"projecte quan la tasca està en estat esborrany."
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Notes"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr "Backlog del producte"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Projecte"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+"Si marqueu aquest camp, el responsable del project rebrà un avís cada vegada "
+"que una tasca sigui completada pel seu equip."
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Cancel·lat"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Nom d'equip"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr "Capçalera correu"
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr "Dies del sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Data de fi"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "Calculat utilitzant la suma de les tasques realitzades."
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+"Si marqueu això, a l'usuari li apareixerà una finestra emergent quan tanqui "
+"una tasca que proposarà un missatge per ser enviat per correu electrònic al "
+"client."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr "Vista tasques del sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Compte analític"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Totes les tasques"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Data límit"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Hores planejades"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Prioritat (0=Molt urgent)"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:scrum.sprint:0
+msgid "State"
+msgstr "Estat"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+"Percentatge de tasques tancades segons el total de tasques a realitzar."
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr "Descripció interna del projecte."
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr "Scrum diari"
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "Calculat com: Temps dedicat + Temps restant."
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Tipus"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr "Dades scrum"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Mitja"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "Temps total"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr "Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Temps previst"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Tasques per avui"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Tasques des d'ahir"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Data d'inici"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Projectes"
+
+#. 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
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Detalls de tasca"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "Vista tasques del projecte"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Retard hores"
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Contacte"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr "Tasques scrum"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "Data de reunió"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Tasques"
+
+#. module: project_scrum
+#: view:scrum.sprint:0
+msgid "Retrospective"
+msgstr "Retrospectiu"
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Crea tasques"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "Progrés (%)"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculat com: Temps dedicat / Temps total."
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr "És scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr "Backlogs esborrany"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr "Sprint backlog"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "Tasques obertes"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr "Bloqueigs trobats"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr "Info. opcional"
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+"Suma del total d'hores de totes les tasques relacionades amb aquest projecte."
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr "Scrum sprint"
+
+#. module: project_scrum
+#: view:scrum.sprint:0
+msgid "Review"
+msgstr "Revisió"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr "Els meus sprints oberts (scrum master)"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Esborrany"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Baixa"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Les meves tasques obertes"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr "Responsable de projecte"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "Pendent"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr "Hi ha alguna cosa que us bloquea?"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Posició"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr "Sprints oberts"
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "Temps dedicat"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "Nom del projecte"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Responsable del producte"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr "Els meus sprints (scrum master)"
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr "Backlog del producte"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr "Backlogs"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Usuari"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Actiu"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+"Calculat com: Temps total - Temps estimat. Proporciona la diferència entre "
+"el temps estimat pel responsable del projecte i el temps real al tancar la "
+"tasca."
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr "Període de temps"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr "Sprints esborrany"
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "Temps treballat"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "Treball realitzat"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr "Vista backlogs del sprint"
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Delegat a"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Data de tancament"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Assignat a"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr "Backlogs exactes"
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+"Suma de les hores dedicades de totes les tasques relacionades amb aquest "
+"projecte."
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+"Si teniu [?] en el nom del projecte, significa que no hi ha compte analític "
+"vinculat a aquest projecte."
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+"Suma de les hores previstes de totes les tasques relacionades amb aquest "
+"projecte."
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Avisa empresa"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr "Els meus sprints (responsable de producte)"
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "Resum de tasca"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"Enllaceu aquest projecte a un compte analític si necessita la gestió "
+"financera dels projectes. Us permet connectar els projectes amb "
+"pressupostos, planificació, anàlisi de costos i ingressos, temps dedicat en "
+"els projectes, etc."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Realitzat"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:scrum.sprint,state:0
+msgid "Open"
+msgstr "Obert"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "Hores reals"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr "Avisa responsable"
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "En progrés"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr "Revisió del sprint"
+
+#. 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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Hores restants"
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "Tasca pare"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Característica"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Molt baixa"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+"Hores de treball de l'horari per a ajustar l'informe del diagrama de Gantt"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr "Sprints realitzats"
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr "Tasca de backlog"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:scrum.sprint:0
+msgid "Planned hours"
+msgstr "Hores planejades"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "Edita projectes"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr "Reunió scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Descripció"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Urgent"
+
+#. module: project_scrum
+#: view:scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Reunions diàries"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "En què esteu treballant avui?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr "En procés"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Progrés (0-100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr "Equip scrum"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr "Projecte scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "Projecte pare"
+
+#. module: project_scrum
+#: view:scrum.sprint:0
+msgid "Sprint Info"
+msgstr "Info. del sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "Scrum master"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Detalls de tasques"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "Hores dedicades"
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Context"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr "Total hores"
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Usuaris"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Seqüència"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Peu afegit al final del correu electrònic del missatge d'avís enviat al "
+"client quan es tanca una tasca."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr "Backlogs oberts"
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Crea tasques"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr "Error! No podeu crear projectes recursius."
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Assigna a"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr "Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr "Fi previst"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "Peu correu"
diff --git a/addons/project_scrum/i18n/cs.po b/addons/project_scrum/i18n/cs.po
new file mode 100644
index 00000000000..00859ed586d
--- /dev/null
+++ b/addons/project_scrum/i18n/cs.po
@@ -0,0 +1,893 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07: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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Storno"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/de.po b/addons/project_scrum/i18n/de.po
new file mode 100644
index 00000000000..6dfb60d6851
--- /dev/null
+++ b/addons/project_scrum/i18n/de.po
@@ -0,0 +1,918 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr "Scrum Produkt Backlog"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "Meeting Bezeichnung"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr "Erzeuge Aufgabe aus Backlog"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Meine Aufgaben"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr "Meine offenen Sprints (Product Owner)"
+
+#. module: project_scrum
+#: model:process.node,note:project_scrum.process_node_productbacklog0
+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 Modellname in der Aktionsdefinition."
+
+#. module: project_scrum
+#: model:ir.module.module,shortdesc:project_scrum.module_meta_information
+msgid "Scrum, Agile Development Method"
+msgstr "Scrum, agile Entwicklungsmethode"
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Fortschritt"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Verbleibende Gesamtzeit, kann periodisch neu berechnet werden durch die "
+"Bearbeitung von Aufgaben."
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Subprojekt"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr "Was haben Sie seit gestern erledigt?"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr "Sind die Erwartungen Ihres Sprint Backlogs korrekt?"
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr "Projekt Mitarbeiter"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr "Scrum Projekte"
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Delegierte Aufgaben"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Header zu Beginn der EMail mit der Meldung an den Kunden bezüglich des "
+"Abschlusses von Aufgaben (Status closed)"
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Wichtigkeit"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr "Scrum Aufgabe"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr "Zeige Projekt Backlog"
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+"Projektmitarbeiter die in keiner Berechnung verwendet werden und nur zur "
+"Information aufgelistet sind."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Sehr dringend"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr "Sprint Rückbetrachtung"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "Sprint Bezeichnung"
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Erwartete Zeit für die Aufgabe, normalerweise eingetragen durch den "
+"Projektmanager im Stadium des Entwurfs."
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Bemerkungen"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr "Produkt Backlog"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Projektportal"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+"Falls Sie dieses Feld anhaken, erhält der Projektmanager jedesmal eine EMail "
+" wenn eine Aufgabe erledigt ist."
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Name Team"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr "Mail Header"
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr "Sprint Tage"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Enddatum"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "Berechnet auf Basis der Summe der abgearbeiteten Aufgaben."
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+"Falls Sie hier einen Haken setzen, wird der Benutzer bei Beendigung einer "
+"Aufgabe ein Popup Fenster erhalten mit dem Vorschlag eine Nachricht per "
+"EMail an den Kunden zu versenden."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr "Anzeige Sprint Aufgaben"
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Analytisches Konto"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Alle Aufgaben"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Deadline"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "geplante Stunden"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "Vorlage"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Priorität"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "Status"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr "Prozent erledigte Aufgaben zu Gesamtsumme der offenen Aufgaben."
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr "Interne Projektbeschreibung"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr "Daily Scrum"
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "Berechnet als: Zeitaufwand + Verbleibende Zeit"
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Typ"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr "Scrum Daten"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Medium"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "Gesamtzeit"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr "Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Geplante Zeit"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Aufgaben von Heute"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Aufgaben seit Gestern"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Anfangsdatum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Projekte"
+
+#. 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
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Aufgabenliste"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "Zeige Aufgaben aus Projekten"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Verzögerung in Stunden"
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr "Scrum Aufgaben"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "Datum Meeting"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr "Retrospektive"
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Erzeuge Aufgabe"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "Mein Aufgabenfortschritt"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Berechnet als: Investierte Zeit / Gesamtzeit"
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr "Ist Scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr "Entwurf Backlogs"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr "Erfasse die benötigte Zeit für Ihre Aufgaben"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "Offene Aufgaben"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr "Hindernissliste"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr "Optionale Information"
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr "Summe Stunden aller Aufgaben zu diesem Projekt."
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr "Scrum Sprint"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "Bewertung"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr "Meine offenen Sprints (Scrum Master)"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Bemerkung"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Entwurf"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Ausreichend"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Meine offenen Aufgaben"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr "Projekt Manager"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "Im Wartezustand"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr "Gibt es Hindernisse?"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr "Offene Sprints"
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "Zeitbedarf"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "Projekt Bezeichnung"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Product Owner"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr "Meine Projekte (Scrum Master)"
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr "Produkt Backlog"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr "Backlogs"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+"Berechnet als: Gesamte Zeit - Erwartete Zeit. Der Wert liefert die Differenz "
+"der erwarteten Zeiten seitens der Projektmanager und der tatsächlichen Zeit "
+"um das Projekt abzuschließen."
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr "Aufgabenliste"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr "Entwurf Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "Arbeitszeit"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "Arbeit erledigt"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr "Anzeige Sprint Backlog"
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Delegiert an"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Datum Ende"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Zuweisung an"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr "Backlog Spezifizierung"
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr "Summe projektbezogene Stunden"
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+"Ein [?] im Projektnamen bedeutet, dass es kein Analysekonto für diese "
+"Projekt gibt"
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr "Summe geplanter Stunden über alle Aufgaben des Projektes."
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Warne Partner"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr "Meine Sprints (Product Owner)"
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "Bezeichnung Aufgabe"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"Für finanzilelle Auswertungen muss ein Projekt einem Anakysekonto zugeordnet "
+"werden. Damit können Projekte Budgets,Planung, Kosten und Erlösen, "
+"Arbeitszeitaufzeichnungen zugeordnet werden."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Erledigt"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "Offen"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "Effektive Stunden"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr "Warne Manager"
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "In Bearbeitung"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr "Sprint Rückbetrachtung"
+
+#. 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"
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Verbleibende Stunden"
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "(Ober-) Aufgabe"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Funktion"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Sehr gering"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "Zeiterfassung Arbeitsstunden für die Ausrichtung des Gantt Charts"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr "Erledigte Sprints"
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr "Backlog Aufgabe"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Geplante Stunden"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "Editiere Projekte"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr "Scrum Meeting"
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Beschreibung"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Dringend"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Daily Meetings"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "Was hast Du heute erledigt?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr "In Weiterbearbeitung"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Fortschritt (0-100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr "Scrum Team"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr "Scrum Projekt"
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "Hauptprojekt"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr "Sprint Information"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "Scrum Master"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Aufgabendetails"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "geleistete Stunden"
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Kontext"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr "Gesamte Stunden"
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Benutzer"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Sequenz"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Footer zu Beginn der Mail für die Mitteilung an den Kunden wenn Aufgabe "
+"geschlossen wird."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr "Offene Backlogs"
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Erzeugte Aufgaben"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr "Fehler! Sie können keine rekursiven Projekte definieren."
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Zuordnen zu"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr "Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr "Erwartetes Ende"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "Mail Footer"
diff --git a/addons/project_scrum/i18n/es.po b/addons/project_scrum/i18n/es.po
new file mode 100644
index 00000000000..d3bb38ee977
--- /dev/null
+++ b/addons/project_scrum/i18n/es.po
@@ -0,0 +1,926 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr "Scrum backlog del producto"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "Nombre de reunión"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr "Desde backlog crear tarea."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Mis tareas"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr "Mis sprints abiertos (responsable de producto)"
+
+#. module: project_scrum
+#: model:process.node,note:project_scrum.process_node_productbacklog0
+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 "Nombre de modelo no válido en la definición de acción."
+
+#. module: project_scrum
+#: model:ir.module.module,shortdesc:project_scrum.module_meta_information
+msgid "Scrum, Agile Development Method"
+msgstr "Scrum, método de desarrollo ágil"
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Progreso"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Total tiempo restante, puede ser reestimado periódicamente por quien se le "
+"ha asignado la tarea."
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Subproyecto"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr "¿Qué ha conseguido desde ayer?"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr "¿Es exacta su estimación del sprint backlog?"
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr "Miembros del proyecto"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr "Proyectos scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Tareas delegadas"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Cabecera añadida al principio del correo electrónico del mensaje de aviso "
+"enviado al cliente cuando una tarea se cierra."
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Importancia"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr "Tarea scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr "Vista backlogs del proyecto"
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+"Miembros del proyecto. No utilizado en ningún cálculo, sólo con el propósito "
+"de informar."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Muy urgente"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr "Sprint retrospectivo"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "Nombre del sprint"
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Tiempo estimado para realizar la tarea, normalmente fijado por el "
+"responsable del proyecto cuando la tarea está en estado borrador."
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr "Backlog del producto"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+"Si marca este campo, el responsable del proyecto recibirá un aviso cada vez "
+"que una tarea sea completada por su equipo."
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Nombre del equipo"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr "Cabecera correo"
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr "Días del sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Fecha de fin"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "Calculado usando la suma de las tareas realizadas."
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+"Si marca esto, al usuario le aparecerá una ventana emergente cuando cierre "
+"una tarea que propondrá un mensaje para ser enviado por correo electrónico "
+"al cliente."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr "Vista tareas del sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Todas las tareas"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Horas planeadas"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "Estado"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr "Porcentaje de tareas cerradas según el total de tareas a realizar."
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr "Descripción interna del proyecto."
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr "Scrum diario"
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr "Datos scrum"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Media"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "Tiempo total"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr "Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Tiempo previsto"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Tareas para hoy"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Tareas desde ayer"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Proyectos"
+
+#. 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
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Detalles de tarea"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "Vista tareas del proyecto"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Retraso horas"
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr "Tareas scrum"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "Fecha de reunión"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr "Retrospectivo"
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Crear tareas"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "Progreso (%)"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculado como: Tiempo dedicado / Tiempo total."
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr "Es scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr "Backlogs borrador"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr "Sprint backlog"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "Tareas abiertas"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr "Bloqueos encontrados"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr "Info. opcional"
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+"Suma del total de horas de todas las tareas relacionadas con este proyecto."
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr "Scrum sprint"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "Revisión"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr "Mis sprints abiertos (scrum master)"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Mis tareas abiertas"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr "Responsable de proyecto"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr "¿Hay algo que le bloquea?"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr "Sprints abiertos"
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "Tiempo dedicado"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "Nombre del proyecto"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Responsable del producto"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr "Mis sprints (scrum master)"
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr "Backlog del producto"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr "Backlogs"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+"Calculado como: Tiempo total - Tiempo estimado. Proporciona la diferencia "
+"entre el tiempo estimado por el responsable del proyecto y el tiempo real al "
+"cerrar la tarea."
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr "Periodo de tiempo"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr "Sprints borrador"
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "Tiempo trabajado"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "Trabajo realizado"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr "Vista backlogs del sprint"
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Delegado a"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Fecha de cierre"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Asignado a"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr "Exactitud de los backlogs"
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+"Suma de las horas dedicadas de todas las tareas relacionadas con este "
+"proyecto."
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+"Si tiene [?] en el nombre del proyecto, significa que no hay cuenta "
+"analítica vinculada a este proyecto."
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+"Suma de las horas previstas de todas las tareas relacionadas con este "
+"proyecto."
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Avisar empresa"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr "Mis sprints (responsable de producto)"
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "Resumen de tarea"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"Enlace este proyecto a una cuenta analítica si necesita la gestión "
+"financiera de los proyectos. Le permite conectar los proyectos con "
+"presupuestos, planificación, análisis de costes e ingresos, tiempo dedicado "
+"en los proyectos, etc."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "Horas reales"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr "Avisar responsable"
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "En progreso"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr "Revisión del sprint"
+
+#. 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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "Tarea padre"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Característica"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Muy baja"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+"Horas de trabajo del horario para ajustar el informe del diagrama de Gantt"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr "Sprints realizados"
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr "Tarea de backlog"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Horas planeadas"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "Editar proyectos"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr "Reunión scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Reuniones diarias"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "¿En qué está trabajando hoy?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Progreso (0-100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr "Equipo scrum"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr "Proyecto scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "Proyecto padre"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr "Info. del sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "Scrum master"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Detalles de tareas"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "Horas dedicadas"
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Contexto"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Pie añadido al final del correo electrónico del mensaje de aviso enviado al "
+"cliente cuando una tarea se cierra."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr "Backlogs abiertos"
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Crear tareas"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr "¡Error! No puede crear proyectos recursivos."
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Asignar a"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr "Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr "Fin previsto"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "Pie correo"
diff --git a/addons/project_scrum/i18n/es_AR.po b/addons/project_scrum/i18n/es_AR.po
new file mode 100644
index 00000000000..44991d642fd
--- /dev/null
+++ b/addons/project_scrum/i18n/es_AR.po
@@ -0,0 +1,925 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr "Scrum backlog del producto"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "Nombre de reunión"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr "Desde backlog crear tarea."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Mis tareas"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr "Mis sprints abiertos (responsable de producto)"
+
+#. module: project_scrum
+#: model:process.node,note:project_scrum.process_node_productbacklog0
+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"
+msgstr "Scrum, método de desarrollo ágil"
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Progreso"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Total tiempo restante, puede ser reestimado periódicamente por quien se le "
+"ha asignado la tarea."
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Sub-Proyecto"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr "¿Qué ha conseguido desde ayer?"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr "¿Es exacta su estimación del sprint backlog?"
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr "Miembros del proyecto"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr "Proyectos scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Tareas delegadas"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Cabecera añadida al principio del correo electrónico del mensaje de aviso "
+"enviado al cliente cuando una tarea se cierra."
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Importancia"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr "Tarea scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr "Vista backlogs del proyecto"
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+"Miembros del proyecto. No utilizado en ningún cálculo, sólo con el propósito "
+"de informar."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Urgente"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr "Sprint retrospectivo"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "Nombre del sprint"
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Tiempo estimado para realizar la tarea, normalmente fijado por el "
+"responsable del proyecto cuando la tarea está en estado borrador."
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr "Backlog del producto"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+"Si marca este campo, el responsable del proyecto recibirá un aviso cada vez "
+"que una tarea sea completada por su equipo."
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Nombre del equipo"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr "Cabecera correo"
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr "Días del sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Fecha finalización"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "Calculado usando la suma de las tareas realizadas."
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+"Si marca esto, al usuario le aparecerá una ventana emergente cuando cierre "
+"una tarea que propondrá un mensaje para ser enviado por correo electrónico "
+"al cliente."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr "Vista tareas del sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Todas las Tareas"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Horas planeadas"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "Provincia"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr "Porcentaje de tareas cerradas según el total de tareas a realizar."
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr "Descripción interna del proyecto."
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr "Scrum diario"
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr "Datos scrum"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Medio"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "Tiempo total"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr "Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Tiempo previsto"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Tareas para hoy"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Tareas desde ayer"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Proyectos"
+
+#. 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
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Detalles de tarea"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "Vista tareas del proyecto"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Retraso horas"
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr "Tareas scrum"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "Fecha de reunión"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr "Retrospectivo"
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Crear tareas"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "Progreso (%)"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculado como: Tiempo dedicado / Tiempo total."
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr "Es scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr "Backlogs borrador"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr "Sprint backlog"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "Tareas abiertas"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr "Bloqueos encontrados"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr "Info. opcional"
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+"Suma del total de horas de todas las tareas relacionadas con este proyecto."
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr "Scrum sprint"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "Revisión"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr "Mis sprints abiertos (scrum master)"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Bajo"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Mis tareas abiertas"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr "Responsable de proyecto"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr "¿Hay algo que le bloquea?"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr "Sprints abiertos"
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "Tiempo dedicado"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "Nombre del proyecto"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Responsable del producto"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr "Mis sprints (scrum master)"
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr "Backlog del producto"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr "Backlogs"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+"Calculado como: Tiempo total - Tiempo estimado. Proporciona la diferencia "
+"entre el tiempo estimado por el responsable del proyecto y el tiempo real al "
+"cerrar la tarea."
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr "Periodo de tiempo"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr "Sprints borrador"
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "Trabajo realizado"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr "Vista backlogs del sprint"
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Delegado a"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Fecha de cierre"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Asignado a"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr "Exactitud de los backlogs"
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+"Suma de las horas dedicadas de todas las tareas relacionadas con este "
+"proyecto."
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+"Si tiene [?] en el nombre del proyecto, significa que no hay cuenta "
+"analítica vinculada a este proyecto."
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+"Suma de las horas previstas de todas las tareas relacionadas con este "
+"proyecto."
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Advertir al partner"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr "Mis sprints (responsable de producto)"
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "Resumen de Tarea"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"Enlace este proyecto a una cuenta analítica si necesita la gestión "
+"financiera de los proyectos. Le permite conectar los proyectos con "
+"presupuestos, planificación, análisis de costes e ingresos, tiempo dedicado "
+"en los proyectos, etc."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "Horas reales"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr "Avisar responsable"
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr "Revisión del sprint"
+
+#. 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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "Tarea padre"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Característica"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Muy baja"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+"Horas de trabajo del horario para ajustar el informe del diagrama de Gantt"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr "Sprints realizados"
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr "Tarea de backlog"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Horas planeadas"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "Editar proyectos"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr "Reunión scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Reuniones diarias"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "¿En qué está trabajando hoy?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr "En ejecución"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Progreso (0-100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr "Equipo scrum"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr "Proyecto scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "Proyecto padre"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr "Info. del sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "Scrum master"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Detalles de tareas"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "Horas dedicadas"
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Contexto"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Pie añadido al final del correo electrónico del mensaje de aviso enviado al "
+"cliente cuando una tarea se cierra."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr "Backlogs abiertos"
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Crear tareas"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr "¡Error! No puede crear proyectos recursivos."
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Asignar a"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr "Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr "Fin previsto"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "Pie de correo"
diff --git a/addons/project_scrum/i18n/et.po b/addons/project_scrum/i18n/et.po
new file mode 100644
index 00000000000..ef01761f39f
--- /dev/null
+++ b/addons/project_scrum/i18n/et.po
@@ -0,0 +1,915 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07: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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr "Scrum toodete backlog"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "Koosoleku nimi"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr "Loo ülesanne backlogist."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Minu ülesanded"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr "Minu avatud sprindid (toote omanik)"
+
+#. module: project_scrum
+#: model:process.node,note:project_scrum.process_node_productbacklog0
+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"
+msgstr "Scrum, nobe arendamise meetod"
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Edenemine"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Järelejäänud aeg kokku. Seda saab ümberhinnata perioodiliselt isik, kellele "
+"ülesande on määratud."
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Alamprojekt"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr "Mida sa oled saavutanud eilsest alates?"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr "Kas Teie Sprint Backlog hinnang on täpne?"
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr "Projekti liikmed"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr "Scrum projektid"
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Volitatud ülesanded"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Ülesande sulgemisel kliendile saadetava hoiatussõnumi algusesse lisatav päis."
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Tähtsus"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr "Scrum ülesanne"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr "Vaata projekti backlogi"
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+"Projekti liige. Ei kasutata ühegi arvutuse jaoks vaid puhtalt informatiivsel "
+"eesmärgil."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Väga pakiline"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr "Tagasiulatuv sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "Sprindi nimi"
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Eeldatav ajakulu ülesande tegemiseks. Enamasti seatakse projektihalduri "
+"poolt, kui ülesanne on mustandi olekus."
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Märkused"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr "Toodete Backlog"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+"Kui sa märgid selle välja siis projektihaldur saab päringu iga kord, kui "
+"ülesanne on lõpetatud tema meeskonna poolt."
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Tühistatud"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Tiimi nimi"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr "Kirja päis"
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr "Sprindi päevad"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Lõppkuupäev"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "Arvutatud kasutades ülesandel tehtud töö summat."
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+"Kui sa märgid selle siis avaneb kasutajal hüpikaken ülesande sulgemisel, mis "
+"pakub e-kirja saatmist kliendile."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr "Vaata sprindi ülesandeid"
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Analüütiline konto"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Kõik ülesanded"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Tähtaeg"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Planeeritud tunnid"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "Mall"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Prioriteet"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "Olek"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+"Suletud ülesannete protsent kõigi tegemist vajavate ülesannete hulgast."
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr "Projekti sisemine kirjeldus"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr "Päevane scrum"
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "Arvutuskäik: kulutatud aeg + järelejäänud aeg"
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Liik"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr "Scrum andmed"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Keskmine"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "Aeg kokku"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr "Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Planeeritud aeg"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Tänased ülessanded"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Ülesanded alates eilsest"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Alguskuupäev"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Projektid"
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Vigane XML vaate arhitektuurile!"
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Ülesande üksikasjad"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "Vaata projekti ülesandeid"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Edasilükkumise tunnid"
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr "Scrum ülesanded"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "Koosoleku kuupäev"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Ülesanded"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr "Tagasiulatuv"
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Loo ülesandeid"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "Edenemine (%)"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Arvutuskäik: kulutatud aeg / aeg kokku."
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr "On scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr "Mustan backlogid"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr "Sprint Backlog"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "Avatud ülesanded"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr "Kohatud tõkked"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr "Valikuline info"
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr "Selle projektiga seotud ülesannete kogusumma tundides."
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr "Scrum sprint"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "Ülevaade"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr "Minu avatud sprindid (Scrum meister)"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Märkus"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Mustand"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Madal"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Minu avatud ülesanded"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr "Projektihaldur"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "Lahtine"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr "Kas on midagi, mis sind blokeerib?"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Staatus"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr "Avatud sprindid"
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "Kulutatud aeg"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "Projekti nimi"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Toote omanik"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr "Minu sprindid (Scrum valdaja)"
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr "Toodete backlog"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr "Backlogid"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Kasutaja"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Aktiivne"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+"Arvutuskäik: aeg kokku - eeldatud aeg. See annab projektihalduri pool "
+"eeldatud aja ja tegelikult ülesande sulgemiseks kulunud aja vahe."
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr "Ajalahter"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr "Mustand sprindid"
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "Tööaeg"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "Töö tehtud"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr "Vaata sprint backlog'i"
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Delegeeritud kellele:"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Sulgemise kuupäev"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Omistatud"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr "Backlog täpne"
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr "Kõigi selle projektiga seotud ülesannetele kulunud aeg."
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+"Kui sul on [?] projekti nimes siis tähendab see, et projektiga pole seotud "
+"ühtegi analüütilist kontot."
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr "Kõigi selle projektiga seotud ülesannetele planeeritud aeg."
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Hoiata partnerit"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr "Minu sprindid (Toote omanik)"
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "Ülesande kokkuvõte"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"Seo see see projekt analüütilise kontoga, kui sa vajad finantshaldust "
+"projektidele. See võimaldab sul ühendada projekte eelarvetega, "
+"planeerimisega, kulu ja tulu analüüsidega, tööajalehtedega jms."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Tehtud"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Loobu"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "Avatud"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "Ehfektiivsed tunnid"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr "Hoiata haldajat"
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "Töös"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr "Sprindi ülevaade"
+
+#. 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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Järelejäänud tunnid"
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "Ülemülesanne"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Omadus"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Väga madal"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "Ajatabeli töötunnid, et kohandada gantt diagrammaruannet"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr "Tehtud sprindid"
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr "Backlog ülesanne"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Planeeritud tunnid"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "Muuda Projekte"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr "Scrum koosolek"
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Kirjeldus"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Kiireloomuline"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Koosolekute päevakava"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "Millega sa töötad täna ?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr "Töös"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Käimas (0-100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr "Scrum meeskond"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr "Scrum projekt"
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "Ülemprojekt"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr "Sprindi info"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "Scrum meister"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Ülesanded detailselt"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "Kulutatud tunnid"
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Kontekst"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr "Tunnid kokku"
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Kasutajad"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Jada"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Ülesande sulgemisel kliendile saadetava hoiatussõnumi algusesse lisatav "
+"jalus."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr "Avatud backlogid"
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Loodud ülesanded"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr "Viga! Sa ei saa luua rekursiivseid projekte."
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Kellele määratud"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr "Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr "Eeldatav lõpp"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "Kirja jalus"
diff --git a/addons/project_scrum/i18n/fr.po b/addons/project_scrum/i18n/fr.po
new file mode 100644
index 00000000000..78d6b374a7d
--- /dev/null
+++ b/addons/project_scrum/i18n/fr.po
@@ -0,0 +1,917 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr "Retard du Produit Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "Nom du Rendez-vous"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr "Créer une tâche à partir du référentiel"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Mes Tâches"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr "Mes Sprints Ouverts (Directeur de Produit)"
+
+#. module: project_scrum
+#: model:process.node,note:project_scrum.process_node_productbacklog0
+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 "Nom de modèle invalide pour la définition de l'action"
+
+#. module: project_scrum
+#: model:ir.module.module,shortdesc:project_scrum.module_meta_information
+msgid "Scrum, Agile Development Method"
+msgstr "Scrum, méthode de développement agile"
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Progression"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Le temps restant total peut être réévalué périodiquement par le prescripteur "
+"de la tâche."
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Sous-projet"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr "Qu'avez vous accompli depuis hier ?"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr "Est-ce que l'estimation du Retard du Sprint est correcte ?"
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr "Membres du projet"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr "Projets Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Tâches déléguées"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"L'entête est ajouté au début de l'email pour que le message d'avertissement "
+"soit envoyer au client lorsque la tâche est fermé."
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Importance"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr "Tâche Scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr "Voir le Retard du Projet"
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+"Membre du projet. Non utilisé dans aucun calcul, juste proposer à titre "
+"d'information"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Très urgent"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr "Retrospective du Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "Nom du Sprint"
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Temps estimé pour réaliser la tâche, habituellement fixé par le responsable "
+"du projet quand la tâche est à l'état brouillon"
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Notes"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr "Retard du Produit"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Projet"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+"Si vous cochez ce champs, le responsable du projet recevra une requête "
+"chaque fois qu'une tâche est completé par son équipe."
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Annulé"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Nom de l'équipe"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr "En-tête de courrier"
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr "Jours du Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Date de fin"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "Calculé en utilisant la somme du travail de tâche effectuée."
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+"Si vous cochez la case, l'utilisateur verra un menu surgissant quand une "
+"tâche sera fermé proposant un message pour envoyer un mail au client."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr "Voir les Tâches du Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Compte analytique"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Toutes les tâches"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Date limite"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Heures planifiés"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "Modèle"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Priorité"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "État"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+"Pourcentage des tâches fermés en accord avec le total des tâches à faire."
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr "Description interne du projet"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr "Scrum Journalier"
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "Calculer comme: Temps passé + Temps restant"
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr "Données Scrum"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Moyenne"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "Temps Total"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr "Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Tâches pour aujourd'hui"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Tâches depuis hier"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Date de début"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Projets"
+
+#. 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
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Détails de la tâche"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "Voir les tâches du projet"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Delais en heures"
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Contact"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr "Tâches Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "Date du rendez-vous"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Tâches"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr "Rétrospective"
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Créer tâches"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "Progression (%)"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculer comme: Temps passé / Temps total"
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr "Est Scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr "Retards Brouillon"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr "Retard du Sprint"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "Tâches ouvertes"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr "Blocages rencontrés"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr "Info optionelle"
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr "Sprint Scrum"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "Critique"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr "Mes Sprints Ouverts (Maître Scrum)"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Note"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Brouillon"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Faible"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Mes Tâches Ouvertes"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr "Responsable du projet"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "En attente"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr "Est-ce que quelque chose vous bloque ?"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "État"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr "Sprints Ouverts"
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "Temps écoulé"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "Nom du Projet"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Directeur de Produit"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr "Mes Sprints (Maître Scrum)"
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr "Retard du Produit"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr "Retards"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Utilisateur"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Actif"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+"Calculer comme: Temps total - Temps estimé. Cela donne la différence de "
+"temps estimé par le responsable projet et le temps réel pour fermer cette "
+"tâche."
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr "Sprints Brouillon"
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "Temps de travail"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "Travail effectué"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr "Voir les retards du sprint"
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Déléguer à"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Date de fin"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Assigné à"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr "Retard Correct"
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr "Total des heures passés de toutes les tâches reliés à ce projet"
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+"Si vous avez [?] dans le nom du projet, cela signifie que vous n'avez pas de "
+"compte analytique lié à ce projet"
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr "Somme des tâches planifiés de toutes les tâches relier à ce projet."
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Avertir le partenaire"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr "Mes Sprints (Directeur de Produit)"
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "Résumé de la tâche"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"Lier ce projet à un compte analytique si vous souhaitez une gestion "
+"financière sur les projets. Il vous active la gestion des projets avec les "
+"budgets, agenda, coût, analyse de revenu, feuilles de temps sur le projet, "
+"etc."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Terminé"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "Ouvert"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "Heures effectives"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr "Avertir le responsable"
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "En cours"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr "Critique du Sprint"
+
+#. 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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "Tâche parente"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Fonctionnalité"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Très basse"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr "Sprints Terminés"
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Heures planifiées"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "Éditer les Projets"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr "Rendez-vous Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Description"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Urgent"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Rendez-vous Journaliers"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "Sur quoi travaillez vous aujourd'hui ?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Avancement (0-100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr "Équipe Scrum"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr "Projet Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "Project Parent"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr "Info sur le Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "Scrum Master"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Détails des Tâches"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Contexte"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Utilisateurs"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr "Retards Ouverts"
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Tâches Créées"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Attribué à"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr "Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/gu.po b/addons/project_scrum/i18n/gu.po
new file mode 100644
index 00000000000..16080f143af
--- /dev/null
+++ b/addons/project_scrum/i18n/gu.po
@@ -0,0 +1,1205 @@
+# Gujarati 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: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-07-21 04:37+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-07-22 03:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "Author"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "મારૂ કાર્ય"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What did you do since the last meeting?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Group By..."
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Are you sure you want to merge these Backlogs?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+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
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are there anything blocking you?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Editable"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
+msgid "Assign sprint to backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_sprint
+#: view:project.scrum.backlog.assign.sprint:0
+msgid "Assign Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.sprint,expected_hours:0
+msgid "Estimated time to do the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,task_hours:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Dates"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Send to Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Daily"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Delegate"
+msgstr ""
+
+#. module: project_scrum
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
+msgid "Merge Product Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+#: view:project.scrum.product.backlog:0
+msgid "Product Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_merge
+#: view:project.scrum.backlog.merge:0
+msgid "Merge Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Change Stage"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Owners"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.task:0
+msgid "Error! task start-date must be lower then task end-date."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Convert to Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:scrum.team,name:0
+msgid "Team Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Expected hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr ""
+
+#. module: project_scrum
+#: view:scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Extended Options..."
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Planning"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.sprint,scrum_master_id:0
+msgid "The person who is maintains the processes for the product"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Create Task for Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.backlog.assign.sprint,state_open:0
+msgid "Change the state of product backlogs to open if its in draft state"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.project,product_owner_id:0
+#: help:project.scrum.sprint,product_owner_id:0
+msgid "The person who is responsible for the product"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What do you plan to do till the next meeting?"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.task,product_backlog_id:0
+msgid ""
+"Related product backlog that contains this task. Used in SCRUM methodology"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optional Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Post Pone"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+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"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
+msgid "Create Tasks from Product Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.project,sprint_size:0
+msgid "Number of days allocated for sprint"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,sequence:0
+msgid "Gives the sequence order when displaying a list of product backlog."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Merge"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_sprint
+msgid "Project Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Feature Description"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,effective_hours:0
+msgid "Spent Hours"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,effective_hours:0
+msgid "Computed using the sum of the time spent on every related tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.open_board_project_scrum
+#: model:ir.ui.menu,name:project_scrum.menu_deshboard_scurm
+msgid "Scrum Dashboard"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.backlog.assign.sprint,state_open:0
+msgid "Set Open"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.report.xml,name:project_scrum.report_scrum_sprint_burndown_chart
+#: view:project.scrum.sprint:0
+msgid "Burndown Chart"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,active:0
+msgid ""
+"If Active field is set to true, it will allow you to hide the product "
+"backlog without removing it."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,task_hours:0
+msgid "Estimated time of the total hours of the tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.project,scrum:0
+msgid "Is a Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid ""
+"This wizard merge backlogs and create one new backlog with draft state (Old "
+"backlogs Will be deleted). And it also merge old tasks from backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Select the project for merged backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:scrum.team,users_id:0
+msgid "Users"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Send to Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/hr.po b/addons/project_scrum/i18n/hr.po
new file mode 100644
index 00000000000..d159cf00cfe
--- /dev/null
+++ b/addons/project_scrum/i18n/hr.po
@@ -0,0 +1,893 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07: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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/hu.po b/addons/project_scrum/i18n/hu.po
new file mode 100644
index 00000000000..d159cf00cfe
--- /dev/null
+++ b/addons/project_scrum/i18n/hu.po
@@ -0,0 +1,893 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07: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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/id.po b/addons/project_scrum/i18n/id.po
new file mode 100644
index 00000000000..d159cf00cfe
--- /dev/null
+++ b/addons/project_scrum/i18n/id.po
@@ -0,0 +1,893 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07: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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/it.po b/addons/project_scrum/i18n/it.po
new file mode 100644
index 00000000000..48eeb044c4b
--- /dev/null
+++ b/addons/project_scrum/i18n/it.po
@@ -0,0 +1,895 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr "Lavoro Arretrato"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "Nome Riunione"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Le Mie Attività"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr "I Miei Sprint Aperti (Titolare Prodotto)"
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Avanzamento"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Sottoprogetto"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr "Cosa hai fatto da ieri ?"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr "Sono accurate le tue stime sugli Sprint arretrati ?"
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr "Progetti"
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Attività delegate"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Importanza"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr "Attività Scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr "Visualizza cronologia progetto"
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Molto Urgente"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr "Cronologia Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "Nome Sprint"
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Note"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr "Cronologia Prodotto"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Progetto"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Annullato"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Nome Team"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr "Giorni Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Data Fine"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr "Visualizza Attività Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Contabilità Analitica"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Tutte le attività"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Scadenza"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Ore pianificate"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Priorità"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "Stato"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr "Scrum Giornaliero"
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Medio"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr "Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Attività di Oggi"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Attività da Ieri"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Data di inizio"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Progetti"
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per Visualizzazione Architettura!"
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Dettagli Attività"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "Visualizza Attività Progetto"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Contatto"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr "Attività Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "Data Riunione"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Attività"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr "Cronologia"
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Crea Attività"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr "è Scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr "Bozza Arretrati"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr "Sprint Arretrati"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "Attività Aperte"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr "Ostacoli incontrati"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr "Informazioni Opzionali"
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr "Sprint Scrum"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "Revisione"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr "I Miei Sprint Aperti (Responsabile Scrum)"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Bozza"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Bassa"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Le Mie Attività Aperte"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "In attesa"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr "Qualcosa di ostacola ?"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Stato"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr "Sprint Aperti"
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Titolare Prodotto"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr "I Miei Sprint (Responsabile Scrum)"
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr "Cronologia Prodotto"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr "Cronomogie"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Utente"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Attivo"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr "Periodo Inderogabile"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr "Bozze Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "Lavoro Eseguito"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr "Visualizza Cronologia Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Data di Fine"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Assegnato a"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr "Cronologia Accurata"
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr "I Miei Sprint (Responsabile Prodotto)"
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "Riassunto Attività"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Completato"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "Aperto"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "Ore Effettive"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr "Revisione Sprint"
+
+#. 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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "Attività Superiore"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Caratteristica"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Molto Bassa"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr "Sprint Completato"
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Ore Pianificate"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "Modifica Progetti"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr "Riunione Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Descrizione"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Riunione Quotidiana"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "Su cosa lavorerai oggi ?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Progresso (0-100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr "Team Scrum"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr "Progetto Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "Progetto Superiore"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr "Informazioni Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "Responsabile Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Dettagli Attività"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Contesto"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Utenti"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr "Cronologie Aperte"
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Attività Create"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Assegna A"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr "Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/ko.po b/addons/project_scrum/i18n/ko.po
new file mode 100644
index 00000000000..1581a5ae68e
--- /dev/null
+++ b/addons/project_scrum/i18n/ko.po
@@ -0,0 +1,898 @@
+# Korean translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#	* project_scrum
+#
+
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr "상품 백로그 스크럼"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "미팅 이름"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr "백로그로부터 과제 생성"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "내 과제"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr "내 오픈된 스프린트 (상품 소유자)"
+
+#. 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"
+msgstr "스크럼, 애자일 개발 방법"
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "진행"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr "총 남은 시간은 과제 담당자에 의해 주기적으로 재평가될 수 있습니다."
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "하위 프로젝트"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr "어제 이후로 귀하가 성취한 것은 무엇인가요?"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr "귀하의 '스프린트 백로그' 추정이 정확한가요?"
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr "프로젝트 멤버"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr "스크럼 프로젝트"
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "위임된 과제"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr "과제가 마감될 때 고객에게 송달되는 알림 이메일의 앞부분에 추가되는 헤더"
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "중요성"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr "스크럼 과제"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr "프로젝트 백로그 보기"
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr "프로젝트 멤버. 계산 목적이 아니라 단지 정보 목적임."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "매우 긴급"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr "스프린트 회고"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "스프린트 이름"
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr "과제에 소요될 추정 시간으로 보통 과제가 초안 상태일 때 프로젝트 관리자에 의해 설정됨."
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "노트"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr "상품 백로그"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "프로젝트"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr "이 필드를 체크하면, 팀 멤버에 의해 과제가 종료될 때 마다, 프로젝트 관리자가 요청을 접수하게 됩니다."
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "취소됨"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "팀 이름"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr "메일 헤더"
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr "스프린트 데이"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "종료 날짜"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "완료된 과제 작업의 합으로 계산됨."
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr "여기를 체크하면, 과제를 마감할 때마다 고객에게 이메일 전송을 제안하는 팝업 창이 뜹니다."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr "스프린트 과제 보기"
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "분석 계정"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "모든 과제"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "마감시한"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "파트너"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "계획된 시간"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "템플릿"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "우선순위"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "상태"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr "해야할 과제의 합계 대비 마감된 과제들의 비율"
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr "프로젝트에 대한 내부 설명"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr "일간 스크럼"
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "계산: 소요 시간 + 남은 시간"
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "타입"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr "스크럼 데이터"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "중간"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "총 시간"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr "스크럼"
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr "계획된 시간"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "오늘 할 일"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "어제 이후 업무"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "시작 날짜"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "프로젝트"
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "유효하지 않은 아키텍처를 위한 XML 보기!"
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "과제 상세 내용"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "프로젝트 과제 보기"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "지연 시간"
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "연락"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr "스크럼 과제"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "미팅 날짜"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "과제"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr "소급성"
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "과제 생성"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "진행 (%)"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "계산: 소요 시간/ 총 시간"
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr "은/는 스크럼입니다."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr "백로그 초안"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr "스프린트 백로그"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "오픈된 과제들"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr "장애물 발생"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr "추가 정보"
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr "이 프로젝트에 관련된 모든 과제들의 총 시간 합계"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr "스크럼 스프린트"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "검토"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr "내 오픈된 스프린트 (스크럼 마스터)"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "노트"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "초안"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "낮음"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "내 오픈된 과제들"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr "프로젝트 매니저"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "보류"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr "귀하를 방해하는 무엇이 있습니까?"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "상태"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr "오픈된 스프린트들"
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "소요 시간"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "프로젝트 이름"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "프로젝트 소유자"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr "내 스프린트 (스크럼 마스터)"
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr "상품 백로그"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr "백로그"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "사용자"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "활성"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr "계산: 총 시간 - 추정 시간. 프로젝트 매니저가 추정한 소요 시간과 실제 과제 마감 시간 간의 차이"
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr "타임박스"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr "스프린트 초안"
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "작업 시간"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "작업 완료"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr "스프린트 백로그 보기"
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "위임받은 자"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "마감된 날짜"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "할당받은 사람"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr "백로그 정확성"
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr "이 프로젝트에 관련된 모든 과제에 소요된 시간 합계"
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr "프로젝트 이름 속에 [?]가 있으며, 이 프로젝트에 연결된 분석 계정이 없음을 의미합니다."
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr "이 프로젝트에 관련된 모든 과제의 계획 시간 합계"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "파트너에게 알림"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr "나의 스프린트 (상품 소유자)"
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "과제 요약"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"프로젝트에 대한 재무 관리가 필요하면 이 프로젝트를 분석 계정에 링크하십시오. 예산, 계획, 원가 및 수입 분석, 프로젝트 타임시트 등을 "
+"수행할 수 있습니다."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "완료"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "취소"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "열기"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "효과적인 시간"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr "매니저에게 알림"
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "진행중"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "남은 시간"
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "부모 과제"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "특성"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "매우 낮음"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "가트 다이어그램 리포트를 조정하기 위한 작업 시간표"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr "완료된 스프린트"
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr "백로그 과제"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "계획된 시간"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "프로젝트 편집"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr "스크럼 미팅"
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "설명"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "긴급"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "일일 미팅"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "오늘 어떤 일을 하셨습니까?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr "실행 중"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "진행 (0-100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr "스크럼 팀"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr "스크럼 프로젝트"
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "부모 프로젝트"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr "스프린트 정보"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "스크럼 마스터"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "과제 상세 정보"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "소요 시간"
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "문맥"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr "총 시간"
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "사용자"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "시퀀스"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr "과제가 마감될 때 고객에게 전송되는 알림 메일에 첨부되는 푸터"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr "오픈된 백로그들"
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "생성된 과제들"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr "에러! 자기 참조 프로젝트를 생성할 수는 없습니다."
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "할당받을 이"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr "스프린트"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr "예상 마감일"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "메일 Footer"
diff --git a/addons/project_scrum/i18n/lt.po b/addons/project_scrum/i18n/lt.po
new file mode 100644
index 00000000000..d159cf00cfe
--- /dev/null
+++ b/addons/project_scrum/i18n/lt.po
@@ -0,0 +1,893 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07: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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/nl.po b/addons/project_scrum/i18n/nl.po
new file mode 100644
index 00000000000..d38d8cbe693
--- /dev/null
+++ b/addons/project_scrum/i18n/nl.po
@@ -0,0 +1,916 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
+"Last-Translator: Pieter J. Kersten (EduSense BV) <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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr "Scrum product backlog"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "Naam vergadering"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr "Maak taak van backlog"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Mijn taken"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr "Mijn geopende sprints (product-eigenaar)"
+
+#. module: project_scrum
+#: model:process.node,note:project_scrum.process_node_productbacklog0
+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"
+msgstr "Scrum, agile development method"
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Voortgang"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Totaal resterende tijd. Kan periodiek opnieuw worden geschat door de aan "
+"deze taak toegewezen persoon."
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Deelproject"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr "Wat heeft u sinds gisteren gerealiseerd?"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr "Is uw sprint backlog inschatting nauwkeurig?"
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr "Projectleden"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr "Scrum projecten"
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Gedelegeerde taken"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Koptekst die toegevoegd wordt aan het begin van het waarschuwingsbericht dat "
+"per email naar de klant gestuurd wordt wanneer een taak wordt afgesloten."
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Belang"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr "Scrum taak"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr "Bekijk project backlog"
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr "Projectlid. Niet gebruikt in berekeningen, slechts ter informatie."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Zeer urgent"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr "Sprint evaluatie"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "Naam sprint"
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Geschatte benodigde tijd om de taak uit te voeren, meestal bepaald door de "
+"projectleider tijdens conceptfase."
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Opmerkingen"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr "Product backlog"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Project"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+"Wanneer u dit veld aanvinkt, zal de projectleider een bericht ontvangen "
+"wanneer een taak afgerond is door één van de teamleden."
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Teamnaam"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr "Kopregels mail"
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr "Sprint dagen"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Einddatum"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "Berekend met de som van het werk dat verricht is."
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+"Als u dit aanvinkt, krijgt de gebruiker een popup als de taak wordt "
+"afgesloten met daarin een voorgesteld bericht dat per email aan de klant kan "
+"worden verzonden."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr "Bekijk sprint taken"
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Kostenplaats"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Alle taken"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Uiterste opleveringsdatum"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Geplande uren"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "Sjabloon"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Prioriteit"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "Status"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr "Percentage afgesloten taken van het totaal aantal taken."
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr "Interne omschrijving van het project."
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr "Dagelijkse scrum"
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "Berekend als: Gebruikte uren + resterende uren."
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Soort"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr "Scrum gegevens"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Gemiddeld"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "Totale tijd"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr "Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Geplande tijd"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Taken voor vandaag"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Taken sinds gisteren"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Begindatum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Projecten"
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML voor weergave!"
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Taakdetails"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "Bekijk taken project"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Uren vertraging"
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Contactpersoon"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr "Scrum taken"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "Vergaderdatum"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Taken"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr "Evaluatie"
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Maak taken"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "Voortgang (%)"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Berekend als: Gebruikte tijd / totale tijd"
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr "Is Scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr "Concept backlogs"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr "Sprint backlog"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "Geopende taken"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr "Ontdekte blokkades"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr "Optionele info"
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr "Som van de totale uren van alle taken gerelateerd aan dit project"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr "Scrum sprint"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "Evaluatie"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr "Mijn geopende sprints (Scrum meester)"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Opmerking"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Concept"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Laag"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Mijn geopende taken"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr "Projectleider"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "Wachtend"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr "Is er iets dat u blokkeert?"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr "Geopende sprints"
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "Bestede tijd"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "Naam project"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Producteigenaar"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr "Mijn sprints (Scrum meester)"
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr "Product backlog"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr "Backlogs"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Gebruiker"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Actief"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+"Berekend als: Totale tijd - geschatte tijd. Geeft het verschil tussen de "
+"geschatte tijd van de projectleider en de werkelijke tijd benodigd om de "
+"taak te sluiten."
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr "Timebox"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr "Concept sprints"
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "Werktijd"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "Afgeronde werkzaamheden"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr "Bekijk sprint backlog"
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Gedelegeerd aan"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Datum afgesloten"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Toegewezen aan"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr "Backlog nauwkeurig"
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr "Totaal van gebruikte uren van alle taken gerelateerd aan dit project"
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+"Wanneer er [?] staat in de projectnaam, dan betekend dit dat er geen "
+"kostenplaats gekoppeld is aan dit project."
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr "Totaal van geplande uren van alle taken gerelateerd aan dit project"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Waarschuw relatie"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr "Mijn sprints"
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "Taaksamenvatting"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"Koppel dit project aan een kostenplaats wanneer u behoefte heeft aan "
+"financieel beheer van projecten. Het geeft u de mogelijkheid om budgetten, "
+"planningen, kosten, opbrengsten, analyses, urenstaten, enz. aan projecten te "
+"verbinden."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Afgerond"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Annuleren"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "Open"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "Effectieve uren"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr "Waarschuw manager"
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "In behandeling"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr "Sprint evaluatie"
+
+#. 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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Resterende uren"
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "Hoofdtaak"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Functionaliteit"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Zeer laag"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "Tabel met werkuren om de GANTT overzichten correct weer te geven"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr "Sprints uitgevoerd"
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr "Backlog taken"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Geplande uren"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "Wijzig projecten"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr "Scrum vergadering"
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Omschrijving"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Urgent"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Dagelijkse vergaderingen"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "Waar werkt u vandaag aan?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr "In uitvoering"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Voortgang (0-100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr "Scrum team"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr "Scrum project"
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "Hoofdproject"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr "Sprint info"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "Scrum meester"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Details taak"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "Gebruikte uren"
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Context"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr "Totale uren"
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Gebruikers"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Reeks"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Voetregels die worden toegevoegd aan het emailbericht waarmee de klant wordt "
+"gewaarschuwd als een taak wordt afgesloten."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr "Geopende backlogs"
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Taken gemaakt"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr "Fout! U kunt geen recursieve projecten definiëren."
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Toewijzen aan"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr "Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr "Verwacht einde"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "Mail voetregels"
diff --git a/addons/project_scrum/i18n/nl_BE.po b/addons/project_scrum/i18n/nl_BE.po
new file mode 100644
index 00000000000..e6c8a668fe3
--- /dev/null
+++ b/addons/project_scrum/i18n/nl_BE.po
@@ -0,0 +1,894 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07: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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project.scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_view_task4
+#: model:ir.ui.menu,name:project.scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project.scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project.scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project.scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_view_task
+#: model:ir.ui.menu,name:project.scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project.scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project.scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project.scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_view_task6
+#: model:ir.ui.menu,name:project.scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project.scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project.scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_view_task5
+#: model:ir.ui.menu,name:project.scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project.scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project.scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project.scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project.scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project.scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project.scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project.scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project.scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project.scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_meeting_form
+#: model:ir.model,name:project.scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project.scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project.scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project.scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project.scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project.scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project.scrum.action_sprint_form
+#: model:ir.ui.menu,name:project.scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/pl.po b/addons/project_scrum/i18n/pl.po
new file mode 100644
index 00000000000..dd80030b20a
--- /dev/null
+++ b/addons/project_scrum/i18n/pl.po
@@ -0,0 +1,905 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "Nazwa spotkania"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Moje zadania"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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 "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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Postęp"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Podprojekt"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr "Członkowie projektu"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr "Projekty scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Zadania przekazane"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Ważność"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr "Zadanie Scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr "Członek projektu. Nie stosowane w obliczeniach, tylko do informacji."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Bardzo pilne"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Szacowany czas wykonania zadania. Zwykle ustalany przez menedżera projektu "
+"kiedy zadanie jest w stanie projektu."
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Uwagi"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Anulowano"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Nazwa Zespołu"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Data końcowa"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Konto analityczne"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Wszystkie zadania"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Ostateczny czas ukończenia:"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Planowane godziny"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "Szablon"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Priorytet"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "Stan"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr "Wewnętrzny opis projektu"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Typ"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Średni"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "Czas całkowity"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Czas planowany"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Zadania na dzisiaj"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Zadania od wczoraj"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Data rozpoczęcia"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Projekty"
+
+#. 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
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Szczegóły zadania"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "Data spotkania"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Zadania"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Utwórz zadania"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "Postęp (%)"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Obliczone jako: Czas przepracowany / Czas całkowity"
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "Przegląd"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Uwaga"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Projekt"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Niski"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Moje otwarte zadania"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr "Menedżer projektu"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "Oczekujący"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Stan"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "Spędzony czas"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "Nazwa projektu"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Właściciel produktu"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Użytkownik"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Aktywne"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+"Obliczone jako: Czas całkowity - Czas szacowany. Jest różnicą pomiędzy "
+"czasem szacowanym przez menedżera projektu, a rzeczywistym czasem do "
+"zamknięcia projektu."
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "Czas pracy"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "Praca wykonana"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Przekazano"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Data zamknięcia"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Przypisano do"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+"Suma przepracowanych godzin we wszystkich zadaniach związanych z tym "
+"projektem."
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"Połącz projekt z kontem analitycznym, jeśli chcesz zarządzać finansowaniem "
+"projektu. To pozwoli ci związać projekt z budżetem, planowaniem, analizą "
+"kosztów i przychodów, kartami czasu pracy itp."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Wykonano"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Anuluj"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "Otwarte"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "Godziny efektywne"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr "Ostrzeż menedżera"
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "W trakcie przetwarzania"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Pozostałe godziny"
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "Zadanie nadrzędne"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Cecha"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Bardzo niski"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Planowane godziny"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "Edytuj projekty"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Pilne"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Spotkania dzienne"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "Nad czym pracujesz dzisiaj ?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr "Uruchomione"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Postęp (0-100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "Projekt nadrzędny"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Szczegóły zadania"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "Przepracowane godziny"
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Kontekst"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr "Suma godzin"
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Użytkownicy"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Numeracja"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Utworzone zadania"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych projektów."
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Przypisz do"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr "Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr "Spodziewany koniec"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "Stopka wiadomości"
diff --git a/addons/project_scrum/i18n/project_scrum.pot b/addons/project_scrum/i18n/project_scrum.pot
new file mode 100644
index 00000000000..de1f6c15d49
--- /dev/null
+++ b/addons/project_scrum/i18n/project_scrum.pot
@@ -0,0 +1,1205 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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:52+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07: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: \n"
+"Plural-Forms: \n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "Author"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What did you do since the last meeting?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Group By..."
+msgstr ""
+
+#. 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"
+msgstr ""
+
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Are you sure you want to merge these Backlogs?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid "Total remaining time, can be re-estimated periodically by the assignee of the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+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
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid "Header added at the beginning of the email for the warning message sent to the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Set to Draft"
+msgstr ""
+
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are there anything blocking you?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Editable"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
+msgid "Assign sprint to backlogs"
+msgstr ""
+
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_sprint
+#: view:project.scrum.backlog.assign.sprint:0
+msgid "Assign Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.sprint,expected_hours:0
+msgid "Estimated time to do the task."
+msgstr ""
+
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,task_hours:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Dates"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Send to Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Daily"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Delegate"
+msgstr ""
+
+#. module: project_scrum
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
+msgid "Merge Product Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+#: view:project.scrum.product.backlog:0
+msgid "Product Backlogs"
+msgstr ""
+
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_merge
+#: view:project.scrum.backlog.merge:0
+msgid "Merge Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Change Stage"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Owners"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.task:0
+msgid "Error! task start-date must be lower then task end-date."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid "Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid "Estimated time to do the task, usually set by the project manager when the task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid "If you check this field, the project manager will receive a request each time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Convert to Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:scrum.team,name:0
+msgid "Team Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Expected hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid "If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr ""
+
+#. module: project_scrum
+#: view:scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Extended Options..."
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Planning"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.sprint,scrum_master_id:0
+msgid "The person who is maintains the processes for the product"
+msgstr ""
+
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Create Task for Product Backlog"
+msgstr ""
+
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.backlog.assign.sprint,state_open:0
+msgid "Change the state of product backlogs to open if its in draft state"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.project,product_owner_id:0
+#: help:project.scrum.sprint,product_owner_id:0
+msgid "The person who is responsible for the product"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What do you plan to do till the next meeting?"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.task,product_backlog_id:0
+msgid "Related product backlog that contains this task. Used in SCRUM methodology"
+msgstr ""
+
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optional Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Post Pone"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+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"
+msgstr ""
+
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
+msgid "Create Tasks from Product Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.project,sprint_size:0
+msgid "Number of days allocated for sprint"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,sequence:0
+msgid "Gives the sequence order when displaying a list of product backlog."
+msgstr ""
+
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid "Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Merge"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_sprint
+msgid "Project Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Feature Description"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,effective_hours:0
+msgid "Spent Hours"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,effective_hours:0
+msgid "Computed using the sum of the time spent on every related tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.open_board_project_scrum
+#: model:ir.ui.menu,name:project_scrum.menu_deshboard_scurm
+msgid "Scrum Dashboard"
+msgstr ""
+
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid "If you have [?] in the project name, it means there are no analytic account linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.backlog.assign.sprint,state_open:0
+msgid "Set Open"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+
+#. module: project_scrum
+#: model:ir.actions.report.xml,name:project_scrum.report_scrum_sprint_burndown_chart
+#: view:project.scrum.sprint:0
+msgid "Burndown Chart"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,active:0
+msgid "If Active field is set to true, it will allow you to hide the product backlog without removing it."
+msgstr ""
+
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,task_hours:0
+msgid "Estimated time of the total hours of the tasks"
+msgstr ""
+
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+
+#. module: project_scrum
+#: field:project.project,scrum:0
+msgid "Is a Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "This wizard merge backlogs and create one new backlog with draft state (Old backlogs Will be deleted). And it also merge old tasks from backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Select the project for merged backlogs"
+msgstr ""
+
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:scrum.team,users_id:0
+msgid "Users"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Send to Product Owner"
+msgstr ""
+
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid "Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
+
diff --git a/addons/project_scrum/i18n/pt.po b/addons/project_scrum/i18n/pt.po
new file mode 100644
index 00000000000..91d946773e6
--- /dev/null
+++ b/addons/project_scrum/i18n/pt.po
@@ -0,0 +1,894 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
+"Last-Translator: neiva.soares@prime.cv <neiva.soares@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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr "Backlog do producto Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "Nome do encontro"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Minhas tarefas"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr "Meus sprints abertos (Dono do producto)"
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Progresso"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Sub-projecto"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr "Que você realizou desde ontem?"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr "Sua estimativa da reserva de Sprint exata?"
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr "Projectos scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Tarefas apagadas"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Importância"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr "Tarefas scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Muito urgente"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr "Retrospectiva do sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "Nome do sprint"
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Projecto"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Nome da equipa"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr "Dias de sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Data final"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr "Ver tarefas de sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Conta da contabilidade analítica"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Todas as tarefas"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Prazo limite"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Horas planeadas"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "Estado"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr "Srum diário"
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Médio"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr "Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Tarefas para hoje"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Tarefas desde ontem"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Data de início"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Projectos"
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML inválido para a arquitectura de vista"
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Detalhes da tarefa"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "Ver tarefas do projecto"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr "Tarefas scrum"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "Data da reunião"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Tarefas"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr "Retrospectiva"
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Criar tarefas"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr "é scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "Tarefas abertas"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr "Informação opcional"
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Baixo"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Minhas tarefas abertas"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "Pendente"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr "Há algo impedindo você ?"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Dono do producto"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr "Timebox"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "Trabalho concluído"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Data de fecho"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Atribuído a"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "Sumário da tarefa"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Concluído"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "Aberto"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "Horas efectivo"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+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 objecto deve começar com x_ e não pode conter um carácter especial!"
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "Tarefas ascendente"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Muito Baixa"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Horas planeadas"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "Editar projectos"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr "Reunião scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Mensagens diárias"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "Em quê estas a trabalhar hoje ?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Progresso (0 - 100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr "Equipa scrum"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr "Projecto scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "Projecto ascendente"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "S"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Detalhes das tarefas"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Contexto"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Utilizadores"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Traefas criadas"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Designar para"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr "Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/pt_BR.po b/addons/project_scrum/i18n/pt_BR.po
new file mode 100644
index 00000000000..f08c77315e3
--- /dev/null
+++ b/addons/project_scrum/i18n/pt_BR.po
@@ -0,0 +1,920 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
+"Last-Translator: Luiz Fernando M.França <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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr "Backlog de Produto do Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "Nome da Reunião"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr "A partir do backlog criar tarefa"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Minhas tarefas"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr "Meus Sprints abertos (Proprietário do Produto)"
+
+#. module: project_scrum
+#: model:process.node,note:project_scrum.process_node_productbacklog0
+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"
+msgstr "Método de Desenvolvimento Ágil, Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Progresso"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Tempo total restante, pode ser re-estimado periodicamente pelo executor da "
+"tarefa"
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Subprojeto"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr "O que você realizou desde ontem?"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr "A sua estimativa do Sprint Backlog está precisa?"
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr "Membros do Projeto"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr "Projetos Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Tarefas Delegadas"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Cabeçalho adicionado ao início do email para a mensagem de aviso enviada ao "
+"cliente quando uma tarefa é encerrada."
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Importância"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr "Tarefa Scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr "Visualizar o backlog do projeto"
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+"Membros do Projeto. Não usado em alguma computação, apenas para a finalidade "
+"da informação."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Urgentíssimo"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr "Retrospectiva do Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "Nome do Sprint"
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+"Tempo estimado para efetuar a tarefa, usualmente ajustado pelo gestor do "
+"projeto quando a tarefa está no estado de rascunho"
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Anotações"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr "Backlog do Produto"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Projeto"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+"Se marcar este campo, o gestor do projeto receberá uma requisição cada vez "
+"que uma tarefa for completada por este time"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Nome da equipe"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr "Cabeçalho de Correspondência"
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr "Dias do Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Data Final"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "Calculado usando a soma do trabalho realizado da tarefa."
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+"Se selecionado, o usuário vai visualizar uma janela quando fechando uma "
+"tarefa que irá propor que uma mensagem seja enviada por email para o cliente"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr "Ver Tarefas do Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Conta Analítica"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Todas as Tarefas"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Prazo limite"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Horas planejadas"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "Modelo"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "Estado"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+"Percentual de tarefas fechadas em relação ao total das tarefas a realizar"
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr "Descrição interna do projeto"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr "Scrum Diário"
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "Calculado como: Tempo Gasto + Tempo Restante"
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr "Dados do Scrum"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Médio"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "Tempo Total"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr "Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr "Tempo Planejado"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "Tarefas para hoje"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr "Tarefas desde ontem"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Data de Início"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Projetos"
+
+#. 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
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Detalhes da Tarefa"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "Ver tarefas do projeto"
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Horas de Atraso"
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Contato"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr "Tarefas do Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "Data da Reunião"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Tarefas"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr "Retrospectiva"
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr "Criar Tarefas"
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "Progresso (%)"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Calculado como: Tempo Gasto / Tempo Total."
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr "É Scrum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr "Backlogs  Esboçados"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr "Backlog do Sprint"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr "Tarefas Abertas"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr "Bloqueios encontrados"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr "Informação Opcional"
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+"Soma do total de horas de todas as tarefas relacionadas com este projeto."
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr "Scrum Sprint"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "Rever"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr "Meus sprints abertos"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Anotação"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Esboço"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Baixo"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr "Minhas tarefas abertas"
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr "Gerente do Projeto"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "Pendente"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr "Existe algo lhe bloqueando?"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr "Sprints Abertos"
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "Tempo Gasto"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "Nome do Projeto"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "Proprietário do Produto"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr "Meus Sprints"
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr "Backlog do Produto"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr "Backlogs"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Usuário"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Ativo"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+"Calculado como: Tempo total - Tempo estimado. Mostra a diferença entre o "
+"tempo estimado pelo responsável do projeto e o tempo real ao fechar a tarefa."
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr "Janela de Tempo"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr "Esboço de Sprints"
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "Tempo Trabalhado"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr "Trabalho concluído"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr "Ver o backlog do sprint"
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Delegado para"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Data de Fechamento"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Atribuída para"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr "Precisão do Backlog"
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+"Soma das horas gastas em todas as tarefas relacionadas a este projeto"
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+"Se existir [?] no nome do projeto, isto significa que não há conta analítica "
+"associada a este projeto."
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+"Soma das horas planejadas para as tarefas relacionadas a este projeto"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "Alerte o Parceiro"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr "Meus Sprints"
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "Sumário da tarefa"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"Associe este projeto a uma conta analítica se precisar gerencia financeira "
+"nos projetos com análise de orçamentos, planejamento, custo e retorno, "
+"planilha de tempo em projetos, etc."
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Concluído"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "Horas efetivas"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr "Avisar o Gestor"
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "Em progresso"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr "Revisão do Sprint"
+
+#. 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 conter nenhum caracter "
+"especial!"
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Horas Restantes"
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr "Tarefa Pai"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Característica"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Muito Baixa"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "Tabela de horas trabalhadas para ajustar o gráfico de Gantt"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr "Sprints Terminados"
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr "Tarefa de Backlog"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Horas Planejadas"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr "Editar Projetos"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr "Reunião de Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "Reuniões Diárias"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr "No que você está trabalhando hoje?"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr "Em execução"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "Progresso (0-100)"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr "Equipe do Scrum"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr "Projeto Scrum"
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr "Projeto pai"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr "Informação do Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "Scrum Master"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "Detalhes das Tarefas"
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "Horas Gastas"
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr "Contexto"
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr "Total de Horas"
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Usuários"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Seqüência"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Rodapé adicionado no email para a mensagem de aviso envaiada para o cliente "
+"quando a tarefa é encerrada."
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr "Backlogs Abertos"
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr "Tarefas Criadas"
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr "Erro ! Você não pode criar projetos recursivos."
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr "Atribuir para"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr "Sprint"
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr "Término Previsto"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "Rodapé de Correspondëncia"
diff --git a/addons/project_scrum/i18n/ro.po b/addons/project_scrum/i18n/ro.po
new file mode 100644
index 00000000000..d159cf00cfe
--- /dev/null
+++ b/addons/project_scrum/i18n/ro.po
@@ -0,0 +1,893 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07: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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/scrum/i18n/ru.po b/addons/project_scrum/i18n/ru.po
similarity index 50%
rename from addons/scrum/i18n/ru.po
rename to addons/project_scrum/i18n/ru.po
index 44bbc963615..9516f178036 100644
--- a/addons/scrum/i18n/ru.po
+++ b/addons/project_scrum/i18n/ru.po
@@ -1,13 +1,13 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* scrum
+#	* project_scrum
 #
 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"
-"PO-Revision-Date: 2010-07-11 08:27+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Pomazan Bogdan <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,55 +16,55 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-07-12 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: scrum
-#: view:scrum.product.backlog:0
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
 msgid "Scrum Product backlog"
 msgstr "Задолженности по продуктам Scrum"
 
-#. module: scrum
-#: field:scrum.meeting,name:0
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
 msgid "Meeting Name"
 msgstr "Название встречи"
 
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
 msgid "From backlog create task."
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
 msgid "My tasks"
 msgstr "Мои задания"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
 msgid "My opened sprints (Product Owner)"
 msgstr "Мои открытые Sprint-ы (Владелец продукта)"
 
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
+#. module: project_scrum
+#: model:process.node,note:project_scrum.process_node_productbacklog0
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: scrum
+#. module: project_scrum
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Недопустимое имя модели в определении действия."
 
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
+#. module: project_scrum
+#: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,progress_rate:0
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
 msgid "Progress"
 msgstr "Выполнение"
 
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
 msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
@@ -72,38 +72,38 @@ msgstr ""
 "Общее количество оставшегося времени может быть переодически переоценено "
 "тем, кто отвечает за это задание."
 
-#. module: scrum
-#: field:scrum.project,child_id:0
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
 msgid "Subproject"
 msgstr "Подпроект"
 
-#. module: scrum
-#: view:scrum.meeting:0
+#. module: project_scrum
+#: view:project.scrum.meeting:0
 msgid "What have you accomplished since yesterday ?"
 msgstr "Что вы закончили со вчерашнего дня?"
 
-#. module: scrum
-#: view:scrum.meeting:0
+#. module: project_scrum
+#: view:project.scrum.meeting:0
 msgid "Are your Sprint Backlog estimate accurate ?"
 msgstr "Являются ли оценки ваших задолженностей по Sprint точными?"
 
-#. module: scrum
-#: field:scrum.project,members:0
+#. module: project_scrum
+#: field:project.scrum.project,members:0
 msgid "Project Members"
 msgstr "Участники проекта"
 
-#. module: scrum
-#: view:scrum.project:0
+#. module: project_scrum
+#: view:project.scrum.project:0
 msgid "Scrum Projects"
 msgstr "Проекты Scrum"
 
-#. module: scrum
-#: field:scrum.task,child_ids:0
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
 msgid "Delegated Tasks"
 msgstr "Делегированные задания"
 
-#. module: scrum
-#: help:scrum.project,warn_header:0
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
 msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
@@ -111,47 +111,47 @@ msgstr ""
 "Заголовок, добавляемый в начало электронного письма для предупреждения, "
 "отправляемого заказчику при закрытии задачи."
 
-#. module: scrum
-#: field:scrum.task,priority:0
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
 msgid "Importance"
 msgstr "Важность"
 
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
 msgid "Scrum Task"
 msgstr "Задание Scrum"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
 msgid "View project's backlog"
 msgstr "Просмотреть задолженноси проекта"
 
-#. module: scrum
-#: help:scrum.project,members:0
+#. module: project_scrum
+#: help:project.scrum.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
 msgstr ""
 "Участников проекта. Не использовать в расчетах, только в информационных "
 "целях."
 
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Very urgent"
 msgstr "Весьма срочно"
 
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
 msgid "Sprint Retrospective"
 msgstr "Ретроспектива Sprint-а"
 
-#. module: scrum
-#: field:scrum.sprint,name:0
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
 msgid "Sprint Name"
 msgstr "Название Sprint-а"
 
-#. module: scrum
-#: help:scrum.task,planned_hours:0
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
 msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
@@ -160,26 +160,26 @@ msgstr ""
 "устанавливается руководителем проекта, когда задание находится в статусе "
 "\"Черновик\"."
 
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
 msgid "Notes"
 msgstr "Примечания"
 
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
 msgid "Product Backlog"
 msgstr "Задолженности по продукту"
 
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
 msgid "Project"
 msgstr "Проект"
 
-#. module: scrum
-#: help:scrum.project,warn_manager:0
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
 msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
@@ -187,39 +187,39 @@ msgstr ""
 "Если вы выберете эту опцию, руководитель проекта каждый раз при завершении "
 "задания его командой будет получать запрос."
 
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
 msgid "Cancelled"
 msgstr "Отменено"
 
-#. module: scrum
-#: field:scrum.team,name:0
+#. module: project_scrum
+#: field:project.scrum.team,name:0
 msgid "Team Name"
 msgstr "Название команды"
 
-#. module: scrum
-#: field:scrum.project,warn_header:0
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
 msgid "Mail Header"
 msgstr "Заголовок письма"
 
-#. module: scrum
-#: field:scrum.project,sprint_size:0
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
 msgid "Sprint Days"
 msgstr "Дней в Sprint-е"
 
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
 msgid "Ending Date"
 msgstr "Дата окончания"
 
-#. module: scrum
-#: help:scrum.task,effective_hours:0
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
 msgstr "Рассчитывается на основе объёма выполненных заданий."
 
-#. module: scrum
-#: help:scrum.project,warn_customer:0
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
 msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
@@ -228,349 +228,349 @@ msgstr ""
 "получать сообщение с предложением послать клиенту письмо по электронной "
 "почте."
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
 msgstr "Просмотреть задания Sprint-а"
 
-#. module: scrum
-#: field:scrum.project,category_id:0
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
 msgid "Analytic Account"
 msgstr "Счет аналитики"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
 msgid "All Tasks"
 msgstr "Все задания"
 
-#. module: scrum
-#: field:scrum.task,date_deadline:0
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
 msgid "Deadline"
 msgstr "Срок"
 
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
 msgid "Partner"
 msgstr "Партнер"
 
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
 msgid "Planned Hours"
 msgstr "Запланированные часы"
 
-#. module: scrum
-#: selection:scrum.project,state:0
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
 msgid "Template"
 msgstr "Шаблон"
 
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
 msgid "Priority"
 msgstr "Приоритет"
 
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
 msgid "State"
 msgstr "Состояние"
 
-#. module: scrum
-#: help:scrum.project,progress_rate:0
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr "Процент закрытых заданий в соответствии с общем количеством заданий."
 
-#. module: scrum
-#: help:scrum.project,notes:0
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
 msgid "Internal description of the project."
 msgstr "Внутреннее описание проекта."
 
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
 msgid "Daily Scrum"
 msgstr "Ежедневный Scrum"
 
-#. module: scrum
-#: help:scrum.task,total_hours:0
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Вычисляется по формуле: Затраченное время + Оставшееся время."
 
-#. module: scrum
-#: field:scrum.task,type:0
+#. module: project_scrum
+#: field:project.scrum.task,type:0
 msgid "Type"
 msgstr "Тип"
 
-#. module: scrum
-#: view:scrum.project:0
+#. module: project_scrum
+#: view:project.scrum.project:0
 msgid "Scrum Data"
 msgstr ""
 
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Medium"
 msgstr "Средний"
 
-#. module: scrum
-#: field:scrum.project,total_hours:0
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
 msgid "Total Time"
 msgstr "Всего времени"
 
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
 msgid "Scrum"
 msgstr "Scrum"
 
-#. module: scrum
-#: field:scrum.project,planned_hours:0
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
 msgid "Planned Time"
 msgstr "Запланированное время"
 
-#. module: scrum
-#: field:scrum.meeting,question_today:0
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
 msgid "Tasks for today"
 msgstr "Задания на сегодня"
 
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
 msgid "Tasks since yesterday"
 msgstr "Задания со вчерашнего дня"
 
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
 msgid "Starting Date"
 msgstr "Дата начала"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
 msgid "Projects"
 msgstr "Проекты"
 
-#. module: scrum
+#. module: project_scrum
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Неправильный XML для просмотра архитектуры!"
 
-#. module: scrum
-#: field:scrum.task,history:0
+#. module: project_scrum
+#: field:project.scrum.task,history:0
 msgid "Task Details"
 msgstr "Описание задания"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
 msgid "View project's tasks"
 msgstr "Показать задания проекта"
 
-#. module: scrum
-#: field:scrum.task,delay_hours:0
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
 msgid "Delay Hours"
 msgstr "Время отсрочки"
 
-#. module: scrum
-#: field:scrum.project,contact_id:0
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
 msgid "Contact"
 msgstr "Контакт"
 
-#. module: scrum
-#: field:scrum.project,tasks:0
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
 msgid "Scrum Tasks"
 msgstr "Задания Scrum"
 
-#. module: scrum
-#: field:scrum.meeting,date:0
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
 msgid "Meeting Date"
 msgstr "Дата встречи"
 
-#. module: scrum
-#: view:scrum.product.backlog:0
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
 msgid "Tasks"
 msgstr "Задания"
 
-#. module: scrum
-#: view:scrum.sprint:0
+#. module: project_scrum
+#: view:project.scrum.sprint:0
 msgid "Retrospective"
 msgstr "Ретроспектива"
 
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
 msgid "Create Tasks"
 msgstr "Создать задания"
 
-#. module: scrum
-#: field:scrum.task,progress:0
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
 msgid "Progress (%)"
 msgstr "Выполнение (%)"
 
-#. module: scrum
-#: help:scrum.task,progress:0
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
 msgstr "Вычисляется по формуле: Затраченное время / Общее время."
 
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
 msgid "Is Scrum"
 msgstr "Является Scrum"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
 msgid "Draft Backlogs"
 msgstr "Неподтвержденные задолженности"
 
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
 msgid "Sprint Backlog"
 msgstr "Задолженности по Sprint-у"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
 msgid "Opened tasks"
 msgstr "Открытые задания"
 
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
 msgid "Blocks encountered"
 msgstr "Обнаружено блокировок"
 
-#. module: scrum
-#: view:scrum.meeting:0
+#. module: project_scrum
+#: view:project.scrum.meeting:0
 msgid "Optionnal Info"
 msgstr "Необязательная информация"
 
-#. module: scrum
-#: help:scrum.project,total_hours:0
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
 msgstr "Общее время всех заданий, связанных с этим проектом."
 
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
 msgid "Scrum Sprint"
 msgstr "Scrum Sprint"
 
-#. module: scrum
-#: view:scrum.sprint:0
+#. module: project_scrum
+#: view:project.scrum.sprint:0
 msgid "Review"
 msgstr "Просмотреть"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
 msgid "My opened sprints (Scrum Master)"
 msgstr "Мои открытые Sprint-ы (Мастер Scrum)"
 
-#. module: scrum
-#: field:scrum.product.backlog,note:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
 msgid "Note"
 msgstr "Примечание"
 
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
 msgid "Draft"
 msgstr "Черновик"
 
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Low"
 msgstr "Низкий"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
 msgid "My opened tasks"
 msgstr "Мои открытые задания"
 
-#. module: scrum
-#: field:scrum.project,manager:0
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
 msgid "Project Manager"
 msgstr "Руководитель проекта"
 
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
 msgid "Pending"
 msgstr "В ожидании"
 
-#. module: scrum
-#: view:scrum.meeting:0
+#. module: project_scrum
+#: view:project.scrum.meeting:0
 msgid "Is there anything blocking you ?"
 msgstr "Вас блокирует что-либо?"
 
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
 msgid "Status"
 msgstr "Статус"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
 msgid "Opened Sprints"
 msgstr "Открытые Sprint-ы"
 
-#. module: scrum
-#: field:scrum.project,effective_hours:0
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
 msgid "Time Spent"
 msgstr "Затрачено времени"
 
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
 msgid "Project Name"
 msgstr "Название проекта"
 
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
 msgid "Product Owner"
 msgstr "Ответственный за продукт"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
 msgid "My Sprints (Scrum Master)"
 msgstr "Мои Sprint-ы (Мастер Scrum)"
 
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
 msgid "Product backlog"
 msgstr "Задолженности по продукту"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
 msgid "Backlogs"
 msgstr "Задолженности"
 
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
 msgid "User"
 msgstr "Пользователь"
 
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
 msgid "Active"
 msgstr "Активен"
 
-#. module: scrum
-#: help:scrum.task,delay_hours:0
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
 msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
@@ -580,61 +580,61 @@ msgstr ""
 "сделанной руководителем проекта, и реальным временем, затраченным на "
 "завершение задания."
 
-#. module: scrum
-#: field:scrum.task,timebox_id:0
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
 msgid "Timebox"
 msgstr "Период"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
 msgid "Draft Sprints"
 msgstr "Черновики Sprint-ов"
 
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
 msgid "Working Time"
 msgstr "Время работы"
 
-#. module: scrum
-#: field:scrum.task,work_ids:0
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
 msgid "Work done"
 msgstr "Работа выполнена"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
 msgstr "Просмотреть задолженности по Sptint-у"
 
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
 msgid "Delegated To"
 msgstr "Поручено"
 
-#. module: scrum
-#: field:scrum.task,date_close:0
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
 msgid "Date Closed"
 msgstr "Дата закрытия"
 
-#. module: scrum
-#: field:scrum.task,user_id:0
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
 msgid "Assigned to"
 msgstr "Назначено на"
 
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
 msgid "Backlog Accurate"
 msgstr "Точность задолженности"
 
-#. module: scrum
-#: help:scrum.project,effective_hours:0
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
 msgstr ""
 "Общее количество времени, затраченного на все задания, связанные с этим "
 "проектом."
 
-#. module: scrum
-#: help:scrum.task,project_id:0
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
 msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
@@ -642,31 +642,31 @@ msgstr ""
 "Если рядом с названием проекта стоит знак [?], значит этот проект не связан "
 "ни с одним аналитическим отчётом."
 
-#. module: scrum
-#: help:scrum.project,planned_hours:0
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
 msgstr ""
 "Общее количество времени, запланированного для выполнения всех заданий, "
 "связанных с этим проектом."
 
-#. module: scrum
-#: field:scrum.project,warn_customer:0
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
 msgid "Warn Partner"
 msgstr "Предупредить Партнера"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
 msgid "My Sprints (Product Owner)"
 msgstr "Мои Sprint-ы (Владелец продукта)"
 
-#. module: scrum
-#: field:scrum.task,name:0
+#. module: project_scrum
+#: field:project.scrum.task,name:0
 msgid "Task summary"
 msgstr "Обзор задания"
 
-#. module: scrum
-#: help:scrum.project,category_id:0
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
 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 "
@@ -677,50 +677,50 @@ msgstr ""
 "бюджетами, планированием, стоимостью и анализом дохода, табели на проектах, "
 "и т.д."
 
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
 msgid "Done"
 msgstr "Выполнено"
 
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
 msgid "Cancel"
 msgstr "Отменить"
 
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
 msgid "Open"
 msgstr "Открыто"
 
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
 msgid "Effective hours"
 msgstr "Эффективные часы"
 
-#. module: scrum
-#: field:scrum.project,warn_manager:0
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
 msgid "Warn Manager"
 msgstr "Предупредить руководителя"
 
-#. module: scrum
-#: selection:scrum.task,state:0
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
 msgid "In Progress"
 msgstr "В работе"
 
-#. module: scrum
-#: field:scrum.sprint,review:0
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
 msgid "Sprint Review"
 msgstr "Обзор Sprint-а"
 
-#. module: scrum
+#. module: project_scrum
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -728,156 +728,156 @@ msgstr ""
 "Название объекта должно начинаться с x_  и не должно содержать специальных "
 "символов !"
 
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
 msgid "Remaining Hours"
 msgstr "Оставшиеся часы"
 
-#. module: scrum
-#: field:scrum.task,parent_id:0
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
 msgid "Parent Task"
 msgstr "Задание-предок"
 
-#. module: scrum
-#: field:scrum.product.backlog,name:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
 msgid "Feature"
 msgstr "Особенность"
 
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Very Low"
 msgstr "Очень низкий"
 
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
 msgstr "Расписание работы для настройки отчета диаграммы Ганта"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
 msgid "Sprints Done"
 msgstr "Выполненные Sprint-ы"
 
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
 msgid "Backlog Task"
 msgstr ""
 
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
 msgid "Planned hours"
 msgstr "Запланированные часы"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
 msgid "Edit Projects"
 msgstr "Изменить проекты"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
 msgid "Scrum Meeting"
 msgstr "Встрача Scrum"
 
-#. module: scrum
-#: field:scrum.task,description:0
+#. module: project_scrum
+#: field:project.scrum.task,description:0
 msgid "Description"
 msgstr "Описание"
 
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Urgent"
 msgstr "Срочно"
 
-#. module: scrum
-#: view:scrum.sprint:0
+#. module: project_scrum
+#: view:project.scrum.sprint:0
 msgid "Daily Meetings"
 msgstr "Ежедневные встречи"
 
-#. module: scrum
-#: view:scrum.meeting:0
+#. module: project_scrum
+#: view:project.scrum.meeting:0
 msgid "What are you working on today ?"
 msgstr "Над чем вы сегодня работаете?"
 
-#. module: scrum
-#: selection:scrum.project,state:0
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
 msgid "Running"
 msgstr "Выполняется"
 
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
 msgid "Progress (0-100)"
 msgstr "Выполнение (0-100)"
 
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
 msgid "Scrum Team"
 msgstr "Команда Scrum"
 
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
 msgid "Scrum Project"
 msgstr "Проект Scrum"
 
-#. module: scrum
-#: field:scrum.project,parent_id:0
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
 msgid "Parent project"
 msgstr "Родительский проект"
 
-#. module: scrum
-#: view:scrum.sprint:0
+#. module: project_scrum
+#: view:project.scrum.sprint:0
 msgid "Sprint Info"
 msgstr "Информация Sprint-а"
 
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
 msgid "Scrum Master"
 msgstr "Мастер Scrum"
 
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
 msgid "Tasks Details"
 msgstr "Описание заданий"
 
-#. module: scrum
-#: field:scrum.task,effective_hours:0
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
 msgid "Hours Spent"
 msgstr "Затраченное время"
 
-#. module: scrum
-#: field:scrum.task,context_id:0
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
 msgid "Context"
 msgstr "Контекст"
 
-#. module: scrum
-#: field:scrum.task,total_hours:0
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
 msgid "Total Hours"
 msgstr "Всего часов"
 
-#. module: scrum
-#: field:scrum.team,users_id:0
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
 msgid "Users"
 msgstr "Пользователи"
 
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
 msgid "Sequence"
 msgstr "Последовательность"
 
-#. module: scrum
-#: help:scrum.project,warn_footer:0
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
 msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
@@ -885,41 +885,41 @@ msgstr ""
 "В начало письма добавлена сноска, чтобы при завершении задания клиент "
 "получал предупреждение."
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
 msgid "Opened Backlogs"
 msgstr "Открытые задолженности"
 
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
 msgid "Created tasks"
 msgstr "Созданные задания"
 
-#. module: scrum
-#: constraint:scrum.project:0
+#. module: project_scrum
+#: constraint:project.scrum.project:0
 msgid "Error ! You can not create recursive projects."
 msgstr "Ошибка! Вы не можете  создать взаимное подчинение проектов!"
 
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
 msgid "Assign To"
 msgstr "Назначить на"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
 msgid "Sprint"
 msgstr "Sprint"
 
-#. module: scrum
-#: field:scrum.project,date_end:0
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
 msgid "Expected End"
 msgstr "Предположительное окончание"
 
-#. module: scrum
-#: field:scrum.project,warn_footer:0
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Нижняя часть письма"
diff --git a/addons/project_scrum/i18n/sl.po b/addons/project_scrum/i18n/sl.po
new file mode 100644
index 00000000000..3fdb9a36212
--- /dev/null
+++ b/addons/project_scrum/i18n/sl.po
@@ -0,0 +1,894 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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"
+"PO-Revision-Date: 2010-07-19 19:07:52+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-06-22 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr "Moje naloge"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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 "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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr "Potek"
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr "Podprojekt"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr "Pomembnost"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr "Zelo nujno"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr "Opombe"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr "Preklicano"
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr "Ime ekipe"
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "Končni datum"
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr "Analitični konto"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr "Vsa opravila"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr "Rok"
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Načrovane ure"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr "Predloga"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr "Prioriteta"
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr "Srednje"
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr "Skupni čas"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr "Začetni datum"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr "Projekti"
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr "Podrobnosti opravila"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Zamuda v urah"
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr "Stik"
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr "Opravila"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr "Potek (%)"
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "Pregled"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "Opomba"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr "Nizko"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr "Vodja projekta"
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr "Čakajoči"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr "Stanje"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr "Porabljeni čas"
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr "Ime projekta"
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr "Aktivno"
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr "Delovni čas"
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Pooblaščen"
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr "Datum zaključka"
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr "Dodeljeno"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr "Povzetek naloge"
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr "Zaključeno"
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "Odpri"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr "V obdelavi"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+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
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Preostale ure"
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "Možnost"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr "Zelo nizko"
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "Načrtovane ure"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr "Nujno"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr "V teku"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr "Uporabniki"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr "Zaporedje"
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
diff --git a/addons/project_scrum/i18n/sq.po b/addons/project_scrum/i18n/sq.po
new file mode 100644
index 00000000000..9ebdada149d
--- /dev/null
+++ b/addons/project_scrum/i18n/sq.po
@@ -0,0 +1,1744 @@
+# Translation of OpenERP Server.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_scrum
+#
+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 15:23:46+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07: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: \n"
+"Plural-Forms: \n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid "Total remaining time, can be re-estimated periodically by the assignee of the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid "Header added at the beginning of the email for the warning message sent to the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid "Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid "Estimated time to do the task, usually set by the project manager when the task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid "If you check this field, the project manager will receive a request each time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid "If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid "Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid "If you have [?] in the project name, it means there are no analytic account linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid "Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
+
+# This file contains the translation of the following modules:
+#	* scrum
+#
+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 15:23:46+0000\n"
+"PO-Revision-Date: 2009-08-28 15:23: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: \n"
+"Plural-Forms: \n"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Scrum Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
+msgid "My tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
+msgid "My opened sprints (Product Owner)"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
+msgid "Total remaining time, can be re-estimated periodically by the assignee of the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
+msgid "Subproject"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What have you accomplished since yesterday ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Projects"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
+msgid "Header added at the beginning of the email for the warning message sent to the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
+msgid "Importance"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
+msgid "Scrum Task"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,members:0
+msgid "Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
+msgid "Estimated time to do the task, usually set by the project manager when the task is in draft state."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
+msgid "If you check this field, the project manager will receive a request each time a task is completed by his team."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,name:0
+msgid "Team Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
+msgid "Mail Header"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
+msgid "If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,type:0
+msgid "Type"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
+msgid "Projects"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
+msgid "Scrum Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
+msgid "Create Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
+msgid "Is Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
+msgid "Draft Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
+msgid "Opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Optionnal Info"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
+msgid "My opened sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
+msgid "My opened tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Is there anything blocking you ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
+msgid "Opened Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
+msgid "My Sprints (Scrum Master)"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
+msgid "Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
+msgid "Timebox"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
+msgid "Draft Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
+msgid "If you have [?] in the project name, it means there are no analytic account linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree4
+msgid "My Sprints (Product Owner)"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,category_id:0
+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 and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: wizard_button:project.scrum.product.backlog.task.create,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,effective_hours:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree3
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree3
+msgid "Sprints Done"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.project:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_form
+msgid "Edit Projects"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.model,name:project_scrum.model_scrum_meeting
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+#: view:project.scrum.meeting:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "What are you working on today ?"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_team
+msgid "Scrum Team"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_project
+#: field:project.scrum.product.backlog,project_id:0
+msgid "Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,parent_id:0
+msgid "Parent project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,context_id:0
+msgid "Context"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.team,users_id:0
+msgid "Users"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+#: field:project.scrum.project,priority:0
+#: field:project.scrum.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.project,warn_footer:0
+msgid "Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_open
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_open
+msgid "Opened Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.wizard,name:project_scrum.wizard_scrum_backlog_task
+msgid "Created tasks"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.scrum.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project_scrum
+#: wizard_field:project.scrum.product.backlog.task.create,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_form
+#: field:project.scrum.meeting,sprint_id:0
+#: field:project.scrum.product.backlog,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
+
diff --git a/addons/scrum/i18n/sv.po b/addons/project_scrum/i18n/sv.po
similarity index 52%
rename from addons/scrum/i18n/sv.po
rename to addons/project_scrum/i18n/sv.po
index a99afddeba5..c53dc9d4631 100644
--- a/addons/scrum/i18n/sv.po
+++ b/addons/project_scrum/i18n/sv.po
@@ -1,13 +1,13 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* scrum
+#	* project_scrum
 #
 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"
-"PO-Revision-Date: 2009-04-10 09:37+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,624 +16,622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-06-22 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: scrum
-#: view:scrum.product.backlog:0
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
 msgid "Scrum Product backlog"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.meeting,name:0
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
 msgid "Meeting Name"
 msgstr ""
 
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
 msgid "From backlog create task."
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task4
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task4
 msgid "My tasks"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree6
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree6
 msgid "My opened sprints (Product Owner)"
 msgstr ""
 
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
+#. module: project_scrum
+#: model:process.node,note:project_scrum.process_node_productbacklog0
 msgid "Create task from backlogs"
 msgstr ""
 
-#. module: scrum
+#. module: project_scrum
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
+#. module: project_scrum
+#: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,progress_rate:0
+#. module: project_scrum
+#: field:project.scrum.project,progress_rate:0
 msgid "Progress"
 msgstr ""
 
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
+#. module: project_scrum
+#: help:project.scrum.task,remaining_hours:0
 msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,child_id:0
+#. module: project_scrum
+#: field:project.scrum.project,child_id:0
 msgid "Subproject"
 msgstr ""
 
-#. module: scrum
-#: view:scrum.meeting:0
+#. module: project_scrum
+#: view:project.scrum.meeting:0
 msgid "What have you accomplished since yesterday ?"
 msgstr ""
 
-#. module: scrum
-#: view:scrum.meeting:0
+#. module: project_scrum
+#: view:project.scrum.meeting:0
 msgid "Are your Sprint Backlog estimate accurate ?"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,members:0
+#. module: project_scrum
+#: field:project.scrum.project,members:0
 msgid "Project Members"
 msgstr ""
 
-#. module: scrum
-#: view:scrum.project:0
+#. module: project_scrum
+#: view:project.scrum.project:0
 msgid "Scrum Projects"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.task,child_ids:0
+#. module: project_scrum
+#: field:project.scrum.task,child_ids:0
 msgid "Delegated Tasks"
 msgstr ""
 
-#. module: scrum
-#: help:scrum.project,warn_header:0
+#. module: project_scrum
+#: help:project.scrum.project,warn_header:0
 msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
 
-#. module: scrum
-#: field:scrum.task,priority:0
+#. module: project_scrum
+#: field:project.scrum.task,priority:0
 msgid "Importance"
 msgstr ""
 
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_task
 msgid "Scrum Task"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
 msgid "View project's backlog"
 msgstr ""
 
-#. module: scrum
-#: help:scrum.project,members:0
+#. module: project_scrum
+#: help:project.scrum.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
 msgstr ""
 
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Very urgent"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
 msgid "Sprint Retrospective"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.sprint,name:0
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
 msgid "Sprint Name"
 msgstr ""
 
-#. module: scrum
-#: help:scrum.task,planned_hours:0
+#. module: project_scrum
+#: help:project.scrum.task,planned_hours:0
 msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
+#. module: project_scrum
+#: field:project.scrum.project,notes:0
+#: field:project.scrum.task,notes:0
 msgid "Notes"
 msgstr "Anteckningar"
 
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_product_backlog
+#: field:project.scrum.task,product_backlog_id:0
 msgid "Product Backlog"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
+#. module: project_scrum
+#: field:project.scrum.sprint,project_id:0
+#: field:project.scrum.task,project_id:0
 msgid "Project"
 msgstr "Projekt"
 
-#. module: scrum
-#: help:scrum.project,warn_manager:0
+#. module: project_scrum
+#: help:project.scrum.project,warn_manager:0
 msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
 msgstr ""
 
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.team,name:0
+#. module: project_scrum
+#: field:project.scrum.team,name:0
 msgid "Team Name"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,warn_header:0
+#. module: project_scrum
+#: field:project.scrum.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,sprint_size:0
+#. module: project_scrum
+#: field:project.scrum.project,sprint_size:0
 msgid "Sprint Days"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
 msgid "Ending Date"
 msgstr ""
 
-#. module: scrum
-#: help:scrum.task,effective_hours:0
+#. module: project_scrum
+#: help:project.scrum.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
 msgstr ""
 
-#. module: scrum
-#: help:scrum.project,warn_customer:0
+#. module: project_scrum
+#: help:project.scrum.project,warn_customer:0
 msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,category_id:0
+#. module: project_scrum
+#: field:project.scrum.project,category_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task
 msgid "All Tasks"
 msgstr "Alla uppgifter"
 
-#. module: scrum
-#: field:scrum.task,date_deadline:0
+#. module: project_scrum
+#: field:project.scrum.task,date_deadline:0
 msgid "Deadline"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
+#. module: project_scrum
+#: field:project.scrum.project,partner_id:0
+#: field:project.scrum.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,planned_hours:0
+#: field:project.scrum.sprint,planned_hours:0
+#: field:project.scrum.task,planned_hours:0
 msgid "Planned Hours"
 msgstr ""
 
-#. module: scrum
-#: selection:scrum.project,state:0
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
 msgid "Template"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,priority:0
 msgid "Priority"
 msgstr "Prioritet"
 
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
+#. module: project_scrum
+#: field:project.scrum.project,state:0
+#: view:project.scrum.sprint:0
 msgid "State"
 msgstr "Status"
 
-#. module: scrum
-#: help:scrum.project,progress_rate:0
+#. module: project_scrum
+#: help:project.scrum.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr ""
 
-#. module: scrum
-#: help:scrum.project,notes:0
+#. module: project_scrum
+#: help:project.scrum.project,notes:0
 msgid "Internal description of the project."
 msgstr ""
 
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
+#. module: project_scrum
+#: field:project.scrum.sprint,meetings_id:0
 msgid "Daily Scrum"
 msgstr ""
 
-#. module: scrum
-#: help:scrum.task,total_hours:0
+#. module: project_scrum
+#: help:project.scrum.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
-#. module: scrum
-#: field:scrum.task,type:0
+#. module: project_scrum
+#: field:project.scrum.task,type:0
 msgid "Type"
 msgstr "Typ"
 
-#. module: scrum
-#: view:scrum.project:0
+#. module: project_scrum
+#: view:project.scrum.project:0
 msgid "Scrum Data"
 msgstr ""
 
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Medium"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,total_hours:0
+#. module: project_scrum
+#: field:project.scrum.project,total_hours:0
 msgid "Total Time"
 msgstr ""
 
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.next_id_67
 msgid "Scrum"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,planned_hours:0
+#. module: project_scrum
+#: field:project.scrum.project,planned_hours:0
 msgid "Planned Time"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.meeting,question_today:0
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
 msgid "Tasks for today"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
+#. module: project_scrum
+#: field:project.scrum.meeting,question_yesterday:0
 msgid "Tasks since yesterday"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
+#. module: project_scrum
+#: field:project.scrum.project,date_start:0
+#: field:project.scrum.sprint,date_start:0
+#: field:project.scrum.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_scrum_project_tree
 msgid "Projects"
 msgstr ""
 
-#. module: scrum
+#. module: project_scrum
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.task,history:0
+#. module: project_scrum
+#: field:project.scrum.task,history:0
 msgid "Task Details"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
 msgid "View project's tasks"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.task,delay_hours:0
+#. module: project_scrum
+#: field:project.scrum.task,delay_hours:0
 msgid "Delay Hours"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,contact_id:0
+#. module: project_scrum
+#: field:project.scrum.project,contact_id:0
 msgid "Contact"
 msgstr "Kontakt"
 
-#. module: scrum
-#: field:scrum.project,tasks:0
+#. module: project_scrum
+#: field:project.scrum.project,tasks:0
 msgid "Scrum Tasks"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.meeting,date:0
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
 msgid "Meeting Date"
 msgstr ""
 
-#. module: scrum
-#: view:scrum.product.backlog:0
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#. module: scrum
-#: view:scrum.sprint:0
+#. module: project_scrum
+#: view:project.scrum.sprint:0
 msgid "Retrospective"
 msgstr ""
 
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
+#. module: project_scrum
+#: wizard_view:project.scrum.product.backlog.task.create,init:0
+#: wizard_button:project.scrum.product.backlog.task.create,init,create:0
 msgid "Create Tasks"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.task,progress:0
+#. module: project_scrum
+#: field:project.scrum.task,progress:0
 msgid "Progress (%)"
 msgstr ""
 
-#. module: scrum
-#: help:scrum.task,progress:0
+#. module: project_scrum
+#: help:project.scrum.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
+#. module: project_scrum
+#: field:project.scrum.project,scrum:0
+#: field:project.scrum.task,scrum:0
 msgid "Is Scrum"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form_draft
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form_draft
 msgid "Draft Backlogs"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
 msgid "Sprint Backlog"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task6
+#: model:ir.ui.menu,name:project_scrum.menu_action_view_task6
 msgid "Opened tasks"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
 msgid "Blocks encountered"
 msgstr ""
 
-#. module: scrum
-#: view:scrum.meeting:0
+#. module: project_scrum
+#: view:project.scrum.meeting:0
 msgid "Optionnal Info"
 msgstr ""
 
-#. module: scrum
-#: help:scrum.project,total_hours:0
+#. module: project_scrum
+#: help:project.scrum.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
 msgstr ""
 
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_scrum_sprint
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
 msgid "Scrum Sprint"
 msgstr ""
 
-#. module: scrum
-#: view:scrum.sprint:0
+#. module: project_scrum
+#: view:project.scrum.sprint:0
 msgid "Review"
 msgstr "Granska"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree7
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree7
 msgid "My opened sprints (Scrum Master)"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.product.backlog,note:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
 msgid "Note"
 msgstr "Anteckning"
 
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+#: selection:project.scrum.task,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,priority:0
+#: selection:project.scrum.task,priority:0
 msgid "Low"
 msgstr "Låg"
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_view_task5
+#: model:ir.ui.menu,name:project_scrum.menu_tasks_yours
 msgid "My opened tasks"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,manager:0
+#. module: project_scrum
+#: field:project.scrum.project,manager:0
 msgid "Project Manager"
 msgstr ""
 
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
+#. module: project_scrum
+#: selection:project.scrum.project,state:0
+#: selection:project.scrum.task,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: scrum
-#: view:scrum.meeting:0
+#. module: project_scrum
+#: view:project.scrum.meeting:0
 msgid "Is there anything blocking you ?"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,state:0
+#: field:project.scrum.sprint,state:0
+#: field:project.scrum.task,state:0
 msgid "Status"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree
 msgid "Opened Sprints"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,effective_hours:0
+#. module: project_scrum
+#: field:project.scrum.project,effective_hours:0
 msgid "Time Spent"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
+#. module: project_scrum
+#: field:project.scrum.project,complete_name:0
+#: field:project.scrum.project,name:0
 msgid "Project Name"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
+#. module: project_scrum
+#: field:project.scrum.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
 msgid "Product Owner"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree5
 msgid "My Sprints (Scrum Master)"
 msgstr ""
 
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
 msgid "Product backlog"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
 msgid "Backlogs"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,user_id:0
 msgid "User"
 msgstr "Användare"
 
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+#: field:project.scrum.project,active:0
+#: field:project.scrum.task,active:0
 msgid "Active"
 msgstr "Aktiv"
 
-#. module: scrum
-#: help:scrum.task,delay_hours:0
+#. module: project_scrum
+#: help:project.scrum.task,delay_hours:0
 msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
 msgstr ""
 
-#. module: scrum
-#: field:scrum.task,timebox_id:0
+#. module: project_scrum
+#: field:project.scrum.task,timebox_id:0
 msgid "Timebox"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree2
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_open_tree2
 msgid "Draft Sprints"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
+#. module: project_scrum
+#: field:project.scrum.project,timesheet_id:0
 msgid "Working Time"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.task,work_ids:0
+#. module: project_scrum
+#: field:project.scrum.task,work_ids:0
 msgid "Work done"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
+#. module: project_scrum
+#: field:project.scrum.task,delegated_user_id:0
 msgid "Delegated To"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.task,date_close:0
+#. module: project_scrum
+#: field:project.scrum.task,date_close:0
 msgid "Date Closed"
 msgstr ""
 
-#. module: scrum
-#: field:scrum.task,user_id:0
+#. module: project_scrum
+#: field:project.scrum.task,user_id:0
 msgid "Assigned to"
 msgstr "Tilldelad till"
 
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
 msgid "Backlog Accurate"
 msgstr ""
 
-#. module: scrum
-#: help:scrum.project,effective_hours:0
+#. module: project_scrum
+#: help:project.scrum.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
 msgstr ""
 
-#. module: scrum
-#: help:scrum.task,project_id:0
+#. module: project_scrum
+#: help:project.scrum.task,project_id:0
 msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
 msgstr ""
 
-#. module: scrum
-#: help:scrum.project,planned_hours:0
+#. module: project_scrum
+#: help:project.scrum.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
 msgstr ""
 
-#. module: scrum
-#: field:scrum.project,warn_customer:0
+#. module: project_scrum
+#: field:project.scrum.project,warn_customer:0
 msgid "Warn Partner"
 msgstr ""
 
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree4msgid "My Sprints (Product Owner)"
 msgstr ""
 
 #. module: scrum
diff --git a/addons/scrum/i18n/tlh.po b/addons/project_scrum/i18n/tlh.po
similarity index 99%
rename from addons/scrum/i18n/tlh.po
rename to addons/project_scrum/i18n/tlh.po
index 495757da589..3d290132742 100644
--- a/addons/scrum/i18n/tlh.po
+++ b/addons/project_scrum/i18n/tlh.po
@@ -7,7 +7,7 @@ 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"
-"PO-Revision-Date: 2009-02-03 06:26+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
similarity index 99%
rename from addons/scrum/i18n/tr.po
rename to addons/project_scrum/i18n/tr.po
index faadb247517..9bd32c5def9 100644
--- a/addons/scrum/i18n/tr.po
+++ b/addons/project_scrum/i18n/tr.po
@@ -7,7 +7,7 @@ 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"
-"PO-Revision-Date: 2010-02-14 21:39+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/scrum/i18n/uk.po b/addons/project_scrum/i18n/uk.po
similarity index 99%
rename from addons/scrum/i18n/uk.po
rename to addons/project_scrum/i18n/uk.po
index 1248e913a85..96358c65246 100644
--- a/addons/scrum/i18n/uk.po
+++ b/addons/project_scrum/i18n/uk.po
@@ -7,7 +7,7 @@ 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"
-"PO-Revision-Date: 2009-02-04 06:32+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/scrum/i18n/vi.po b/addons/project_scrum/i18n/vi.po
similarity index 99%
rename from addons/scrum/i18n/vi.po
rename to addons/project_scrum/i18n/vi.po
index aeac69360c2..80f94c820c1 100644
--- a/addons/scrum/i18n/vi.po
+++ b/addons/project_scrum/i18n/vi.po
@@ -8,7 +8,7 @@ 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:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/scrum/i18n/zh_CN.po b/addons/project_scrum/i18n/zh_CN.po
similarity index 99%
rename from addons/scrum/i18n/zh_CN.po
rename to addons/project_scrum/i18n/zh_CN.po
index 9ef5a0f1b49..f34a67b3e42 100644
--- a/addons/scrum/i18n/zh_CN.po
+++ b/addons/project_scrum/i18n/zh_CN.po
@@ -7,7 +7,7 @@ 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"
-"PO-Revision-Date: 2010-03-20 10:28+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/scrum/i18n/zh_TW.po b/addons/project_scrum/i18n/zh_TW.po
similarity index 99%
rename from addons/scrum/i18n/zh_TW.po
rename to addons/project_scrum/i18n/zh_TW.po
index c3f8246cf04..be75acd60f9 100644
--- a/addons/scrum/i18n/zh_TW.po
+++ b/addons/project_scrum/i18n/zh_TW.po
@@ -7,7 +7,7 @@ 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"
-"PO-Revision-Date: 2009-01-30 13:29+0000\n"
+"PO-Revision-Date: 2010-07-19 19:07:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/scrum/process/scrum_process.xml b/addons/project_scrum/process/project_scrum_process.xml
similarity index 84%
rename from addons/scrum/process/scrum_process.xml
rename to addons/project_scrum/process/project_scrum_process.xml
index c9c7db868f6..9700677c100 100644
--- a/addons/scrum/process/scrum_process.xml
+++ b/addons/project_scrum/process/project_scrum_process.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-    
-        <!--        
+
+        <!--
             Process Node
         -->
-    
+
         <record id="process_node_productbacklog0" model="process.node">
-            <field name="menu_id" ref="scrum.menu_action_product_backlog_form"/>
-            <field name="model_id" ref="scrum.model_scrum_product_backlog"/>
+            <field name="menu_id" ref="menu_action_product_backlog_form"/>
+            <field name="model_id" ref="model_project_scrum_product_backlog"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product backlog&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Create task from backlogs&quot;&quot;&quot;" name="note"/>
@@ -16,11 +16,11 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-        
-        <!--        
+
+        <!--
             Process Transition
         -->
-        
+
         <record id="process_transition_backlogtask0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -29,6 +29,6 @@
             <field model="process.node" name="target_node_id" ref="project.process_node_drafttask0"/>
             <field model="process.node" name="source_node_id" ref="process_node_productbacklog0"/>
         </record>
-    
+
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/scrum/scrum.py b/addons/project_scrum/project_scrum.py
similarity index 89%
rename from addons/scrum/scrum.py
rename to addons/project_scrum/project_scrum.py
index 0eb23916bc1..11e1b785405 100644
--- a/addons/scrum/scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -27,7 +27,7 @@ import re
 import tools
 from tools.translate import _
 
-class scrum_project(osv.osv):
+class project_scrum_project(osv.osv):
     _inherit = 'project.project'
     _columns = {
         'product_owner_id': fields.many2one('res.users', 'Product Owner', help="The person who is responsible for the product"),
@@ -39,11 +39,11 @@ class scrum_project(osv.osv):
         'sprint_size': 15,
         'scrum': 1
     }
-scrum_project()
+project_scrum_project()
 
-class scrum_sprint(osv.osv):
-    _name = 'scrum.sprint'
-    _description = 'Scrum Sprint'
+class project_scrum_sprint(osv.osv):
+    _name = 'project.scrum.sprint'
+    _description = 'Project Scrum Sprint'
 
     def _calc_progress(self, cr, uid, ids, name, args, context):
         res = {}
@@ -115,10 +115,10 @@ class scrum_sprint(osv.osv):
         'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)], help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
         'product_owner_id': fields.many2one('res.users', 'Product Owner', required=True,help="The person who is responsible for the product"),
         'scrum_master_id': fields.many2one('res.users', 'Scrum Master', required=True,help="The person who is maintains the processes for the product"),
-        'meeting_ids': fields.one2many('scrum.meeting', 'sprint_id', 'Daily Scrum'),
+        'meeting_ids': fields.one2many('project.scrum.meeting', 'sprint_id', 'Daily Scrum'),
         'review': fields.text('Sprint Review'),
         'retrospective': fields.text('Sprint Retrospective'),
-        'backlog_ids': fields.one2many('scrum.product.backlog', 'sprint_id', 'Sprint Backlog'),
+        'backlog_ids': fields.one2many('project.scrum.product.backlog', 'sprint_id', 'Sprint Backlog'),
         'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
         'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours', help="Computed using the sum of the task work done."),
         'expected_hours': fields.function(_calc_expected, method=True, string='Planned Hours', help='Estimated time to do the task.'),
@@ -153,10 +153,10 @@ class scrum_sprint(osv.osv):
             v['date_stop'] = (DateTime.now() + DateTime.RelativeDateTime(days=int(proj.sprint_size or 14))).strftime('%Y-%m-%d')
         return {'value':v}
 
-scrum_sprint()
+project_scrum_sprint()
 
-class scrum_product_backlog(osv.osv):
-    _name = 'scrum.product.backlog'
+class project_scrum_product_backlog(osv.osv):
+    _name = 'project.scrum.product.backlog'
     _description = 'Product Backlog'
 
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
@@ -168,7 +168,7 @@ class scrum_product_backlog(osv.osv):
         if match:
             ids = self.search(cr, uid, [('sprint_id','=', int(match.group(1)))], limit=limit, context=context)
             return self.name_get(cr, uid, ids, context=context)
-        return super(scrum_product_backlog, self).name_search(cr, uid, name, args, operator,context, limit=limit)
+        return super(project_scrum_product_backlog, self).name_search(cr, uid, name, args, operator,context, limit=limit)
 
     def _calc_progress(self, cr, uid, ids, name, args, context):
         res = {}
@@ -200,9 +200,10 @@ class scrum_product_backlog(osv.osv):
         return res
 
     def button_cancel(self, cr, uid, ids, context={}):
+        obj_project_task = self.pool.get('project.task')
         self.write(cr, uid, ids, {'state':'cancel'}, context=context)
         for backlog in self.browse(cr, uid, ids, context=context):
-            self.pool.get('project.task').write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'cancelled'})
+            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={}):
@@ -217,9 +218,10 @@ class scrum_product_backlog(osv.osv):
         return True
 
     def button_close(self, cr, uid, ids, 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):
-            self.pool.get('project.task').write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'done'})
+            obj_project_task.write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'done'})
             message = _('Product Backlog ') + " '" + backlog.name + "' "+ _("is Closed.")
             self.log(cr, uid, backlog.id, message)
         return True
@@ -249,7 +251,7 @@ class scrum_product_backlog(osv.osv):
         'active' : fields.boolean('Active', help="If Active field is set to true, it will allow you to hide the product backlog without removing it."),
         'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)], help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
         'user_id': fields.many2one('res.users', 'Author'),
-        'sprint_id': fields.many2one('scrum.sprint', 'Sprint'),
+        'sprint_id': fields.many2one('project.scrum.sprint', 'Sprint'),
         'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of product backlog."),
         'tasks_id': fields.one2many('project.task', 'product_backlog_id', 'Tasks Details'),
         'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
@@ -265,42 +267,42 @@ class scrum_product_backlog(osv.osv):
         'user_id': lambda self, cr, uid, context: uid,
     }
     _order = "sequence"
-scrum_product_backlog()
+project_scrum_product_backlog()
 
-class scrum_task(osv.osv):
+class project_scrum_task(osv.osv):
     _name = 'project.task'
     _inherit = 'project.task'
 
     def _get_task(self, cr, uid, ids, context={}):
         result = {}
-        for line in self.pool.get('scrum.product.backlog').browse(cr, uid, ids, context=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
         return result.keys()
     _columns = {
-        'product_backlog_id': fields.many2one('scrum.product.backlog', 'Product Backlog',help="Related product backlog that contains this task. Used in SCRUM methodology"),
-        'sprint_id': fields.related('product_backlog_id','sprint_id', type='many2one', relation='scrum.sprint', string='Sprint',
+        'product_backlog_id': fields.many2one('project.scrum.product.backlog', 'Product Backlog',help="Related product backlog that contains this task. Used in SCRUM methodology"),
+        'sprint_id': fields.related('product_backlog_id','sprint_id', type='many2one', relation='project.scrum.sprint', string='Sprint',
             store={
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['product_backlog_id'], 10),
-                'scrum.product.backlog': (_get_task, ['sprint_id'], 10)
+                'project.scrum.product.backlog': (_get_task, ['sprint_id'], 10)
             }),
     }
 
     def onchange_backlog_id(self, cr, uid, backlog_id):
         if not backlog_id:
             return {}
-        project_id = self.pool.get('scrum.product.backlog').browse(cr, uid, backlog_id).project_id.id
+        project_id = self.pool.get('project.scrum.product.backlog').browse(cr, uid, backlog_id).project_id.id
         return {'value': {'project_id': project_id}}
-scrum_task()
+project_scrum_task()
 
-class scrum_meeting(osv.osv):
-    _name = 'scrum.meeting'
+class project_scrum_meeting(osv.osv):
+    _name = 'project.scrum.meeting'
     _description = 'Scrum Meeting'
     _order = 'date desc'
     _columns = {
         'name' : fields.char('Meeting Name', size=64),
         'date': fields.date('Meeting Date', required=True),
-        'sprint_id': fields.many2one('scrum.sprint', 'Sprint', required=True),
+        'sprint_id': fields.many2one('project.scrum.sprint', 'Sprint', required=True),
         'project_id': fields.many2one('project.project', 'Project'),
         'question_yesterday': fields.text('Tasks since yesterday'),
         'question_today': fields.text('Tasks for today'),
@@ -357,5 +359,5 @@ class scrum_meeting(osv.osv):
             return False
         return True
 
-scrum_meeting()
+project_scrum_meeting()
 
diff --git a/addons/scrum/scrum_demo.xml b/addons/project_scrum/project_scrum_demo.xml
similarity index 87%
rename from addons/scrum/scrum_demo.xml
rename to addons/project_scrum/project_scrum_demo.xml
index 9e97e635cf3..d162a396abe 100644
--- a/addons/scrum/scrum_demo.xml
+++ b/addons/project_scrum/project_scrum_demo.xml
@@ -13,9 +13,9 @@
             <field model="res.users" name="product_owner_id" search="[('login','=','demo')]"/>
         </record>
 
-        <!-- Resource: scrum.sprint -->
+        <!-- Resource: project_scrum.sprint -->
 
-        <record id="scrum_sprint_0" model="scrum.sprint">
+        <record id="scrum_sprint_0" model="project.scrum.sprint">
             <field name="date_stop">2005-12-20</field>
             <field name="name">Sprint for V3.2.0</field>
             <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
@@ -26,7 +26,7 @@
 
         <!-- Resource: project.product.backlog -->
 
-        <record id="scrum_product_backlog_0" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_0" model="project.scrum.product.backlog">
             <field name="priority">3</field>
             <field name="name">Automatic migration system</field>
             <field name="expected_hours">6.0</field>
@@ -35,54 +35,54 @@
             <field name="state">done</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_1" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_1" model="project.scrum.product.backlog">
             <field name="priority">3</field>
             <field name="name">New accounting module</field>
             <field name="expected_hours">111.0</field>
             <field name="note">The accounting module of Open ERP (financial accounting and management accounting) is being reshaped. New functionnalities will be added: intangible assets, a new way of presenting ledgers and bookings, new stock valuation calculation, and lots of predefined reports. </field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
-			<field name="state">open</field>            
+			<field name="state">open</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_2" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_2" model="project.scrum.product.backlog">
             <field name="priority">3</field>
             <field name="name">Automated Plugin System to install/uninstall modules</field>
             <field name="expected_hours">4.0</field>
             <field name="note">We have to develop a plug-in system which will enable to install/remove modules. The basic version of Open ERP will include only the required minimum, and you will select the modules thanks to the plug-in manager. This allows you to limit your system to your real needs: quality management, localisations, project and service management, marketing campaigns, and so on... </field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
-            <field name="state">open</field>     
+            <field name="state">open</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_3" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_3" model="project.scrum.product.backlog">
             <field name="name">Review all terms</field>
             <field name="expected_hours">8.0</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
-            <field name="state">done</field>     
+            <field name="state">done</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_4" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_4" model="project.scrum.product.backlog">
             <field name="name">Bugfixes</field>
             <field name="expected_hours">6.0</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
-            <field name="state">open</field>  
+            <field name="state">open</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_5" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_5" model="project.scrum.product.backlog">
             <field name="name">Test for 3.2.0 Publishing</field>
             <field name="expected_hours">5.0</field>
             <field name="note">Test Open ERP to release stable 3.2.0 version. (may be 3.2.0-pre1 ?)</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_6" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_6" model="project.scrum.product.backlog">
             <field name="name">Reshape the complete menu</field>
             <field name="expected_hours">4.0</field>
             <field name="note">Restructure  the Open ERP menu to be more like others ERP.</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
-          	<field name="state">open</field>  
+          	<field name="state">open</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
-        <record id="scrum_product_backlog_7" model="scrum.product.backlog">
+        <record id="scrum_product_backlog_7" model="project.scrum.product.backlog">
             <field name="name">Editable Trees</field>
             <field name="expected_hours">12.0</field>
             <field name="note">Editable trees in list and one2many_list widgets.</field>
@@ -98,7 +98,7 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Review all English Terms</field>
             <field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>            
+            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_3"/>
         </record>
         <record id="scrum_task_4" model="project.task">
@@ -107,7 +107,7 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Review all french terms</field>
           	<field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>               
+            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_3"/>
         </record>
         <record id="scrum_task_5" model="project.task">
@@ -116,7 +116,7 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Analytic Accounting features</field>
           	<field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>             
+            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_6" model="project.task">
@@ -149,7 +149,7 @@
             <field name="description">Cash book, general ledger, accounts list, aged trial balance</field>
              <field name="name">Accounting Report General</field>
              <field name="state">open</field>
-			<field eval="[(6,0,[ref('scrum.scrum_task_8')])]" name="child_ids"/>             
+			<field eval="[(6,0,[ref('scrum_task_8')])]" name="child_ids"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_10" model="project.task">
@@ -164,7 +164,7 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Accounting Report Analytic</field>
- 			<field name="state">open</field>            
+ 			<field name="state">open</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_12" model="project.task">
@@ -173,7 +173,7 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Bugfix - memory leak</field>
           	<field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>               
+            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_4"/>
         </record>
         <record id="scrum_task_13" model="project.task">
@@ -181,8 +181,8 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Bugfix - Translations</field>
-			<field name="state">open</field>          
-			 <field eval="[(6,0,[ref('scrum.scrum_task_12')])]" name="child_ids"/>
+			<field name="state">open</field>
+			 <field eval="[(6,0,[ref('scrum_task_12')])]" name="child_ids"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_4"/>
         </record>
         <record id="scrum_task_14" model="project.task">
@@ -205,7 +205,7 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Test 3.2.0 before releasing</field>
- 			<field name="state">open</field>    
+ 			<field name="state">open</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_5"/>
         </record>
         <record id="scrum_task_17" model="project.task">
@@ -214,10 +214,10 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="description">default values, onchange, required, add on top or bottom and shortcuts (Ctrl S, Ctrl X, ...)</field>
             <field name="name">Editable trees</field>
-			<field name="state">open</field>  
+			<field name="state">open</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_7"/>
         </record>
-		<record id="scrum_meeting_0" model="scrum.meeting">
+		<record id="scrum_meeting_0" model="project.scrum.meeting">
 			<field name="question_yesterday">
 Admin: Worked on the Automatic migration system
 Demo: Worked on the Test 3.2.0 before releasing
@@ -228,7 +228,7 @@ Demo: Work on Editable trees</field>
 			<field name="question_blocks">
 Demo :Bugfix - memory leak
 			</field>
-			<field name="sprint_id" ref="scrum.scrum_sprint_0"/>
+			<field name="sprint_id" ref="scrum_sprint_0"/>
 			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
 		</record>
 		<record id="project_task_work_scrum_task1" model="project.task.work">
@@ -247,16 +247,7 @@ Demo :Bugfix - memory leak
 			<field eval="5.0" name="hours"/>
 			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
 		</record>
-				
-		<record id="project_task_work_scrum_task2" model="project.task.work">
-			<field name="user_id" ref="base.user_root"/>
-			<field name="name">Create a script for migration and testing</field>
-			<field name="task_id" ref="scrum_task_6"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field eval="5.0" name="hours"/>
-			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
-		</record>
-	<record id="project_task_work_scrum_task1" model="project.task.work">
+        <record id="project_task_work_scrum_task3" model="project.task.work">
 			<field name="user_id" ref="base.user_root"/>
 			<field name="name">Add on top or bottom and shortcuts</field>
 			<field name="task_id" ref="scrum_task_17"/>
@@ -264,6 +255,6 @@ Demo :Bugfix - memory leak
 			<field eval="10.0" name="hours"/>
 			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
 		</record>
-		
+
     </data>
 </openerp>
diff --git a/addons/scrum/scrum_report.xml b/addons/project_scrum/project_scrum_report.xml
similarity index 62%
rename from addons/scrum/scrum_report.xml
rename to addons/project_scrum/project_scrum_report.xml
index 8d95d8bdc37..b958732d3c4 100644
--- a/addons/scrum/scrum_report.xml
+++ b/addons/project_scrum/project_scrum_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report auto="False"  id="report_scrum_sprint_burndown_chart" model="scrum.sprint" name="scrum.sprint.burndown" string="Burndown Chart"/>
+        <report auto="False"  id="report_scrum_sprint_burndown_chart" model="project.scrum.sprint" name="scrum.sprint.burndown" string="Burndown Chart"/>
     </data>
 </openerp>
diff --git a/addons/scrum/scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
similarity index 93%
rename from addons/scrum/scrum_view.xml
rename to addons/project_scrum/project_scrum_view.xml
index 86f92981fed..007399c40a8 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -29,8 +29,8 @@
        -->
 
         <record id="view_scrum_product_backlog_tree" model="ir.ui.view">
-            <field name="name">scrum.product.backlog.tree</field>
-            <field name="model">scrum.product.backlog</field>
+            <field name="name">project.scrum.product.backlog.tree</field>
+            <field name="model">project.scrum.product.backlog</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel','done');blue:state in ('pending')" string="Product Backlog">
@@ -52,8 +52,8 @@
         </record>
 
         <record id="view_scrum_product_backlog_form" model="ir.ui.view">
-            <field name="name">scrum.product.backlog.form</field>
-            <field name="model">scrum.product.backlog</field>
+            <field name="name">project.scrum.product.backlog.form</field>
+            <field name="model">project.scrum.product.backlog</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product backlog">
@@ -90,7 +90,7 @@
                                         <field name="total_hours" widget="float_time"/>
                                         <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
                                         <field name="date_deadline" invisible="context.get('set_visible',False)"/>
-                                        <field name="type" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
+                                        <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                                         <field name="date_start" invisible="1"/>
                                         <field name="date_end" invisible="1"/>
                                         <button name="next_type" invisible="context.get('set_visible',False)"
@@ -124,8 +124,8 @@
         </record>
 
         <record model="ir.ui.view" id="view_scrum_product_backlog_search">
-            <field name="name">scrum.product.backlog.search</field>
-            <field name="model">scrum.product.backlog</field>
+            <field name="name">project.scrum.product.backlog.search</field>
+            <field name="model">project.scrum.product.backlog</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Backlogs">
@@ -177,7 +177,7 @@
 
         <record id="action_product_backlog_form" model="ir.actions.act_window">
             <field name="name">Product Backlogs</field>
-            <field name="res_model">scrum.product.backlog</field>
+            <field name="res_model">project.scrum.product.backlog</field>
             <field name="view_type">form</field>
             <field name="context">{'search_default_current': 1}</field>
             <field name="search_view_id" ref="view_scrum_product_backlog_search"/>
@@ -193,8 +193,8 @@
        -->
 
         <record id="view_scrum_sprint_tree" model="ir.ui.view">
-            <field name="name">scrum.sprint.tree</field>
-            <field name="model">scrum.sprint</field>
+            <field name="name">project.scrum.sprint.tree</field>
+            <field name="model">project.scrum.sprint</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('pending');grey:state in ('cancel','done')" string="Scrum Sprint">
@@ -215,8 +215,8 @@
             </field>
         </record>
         <record id="view_scrum_sprint_form" model="ir.ui.view">
-            <field name="name">scrum.sprint.form</field>
-            <field name="model">scrum.sprint</field>
+            <field name="name">project.scrum.sprint.form</field>
+            <field name="model">project.scrum.sprint</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrum Sprint">
@@ -265,8 +265,8 @@
         </record>
 
         <record model="ir.ui.view" id="view_scrum_sprint_search">
-            <field name="name">scrum.sprint.search</field>
-            <field name="model">scrum.sprint</field>
+            <field name="name">project.scrum.sprint.search</field>
+            <field name="model">project.scrum.sprint</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sprints">
@@ -296,7 +296,7 @@
 
         <record id="action_sprint_all_tree" model="ir.actions.act_window">
             <field name="name">Sprints</field>
-            <field name="res_model">scrum.sprint</field>
+            <field name="res_model">project.scrum.sprint</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_scrum_sprint_tree"/>
@@ -312,8 +312,8 @@
        -->
 
         <record id="view_scrum_meeting_tree" model="ir.ui.view">
-            <field name="name">scrum.meeting.tree</field>
-            <field name="model">scrum.meeting</field>
+            <field name="name">project.scrum.meeting.tree</field>
+            <field name="model">project.scrum.meeting</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Scrum Sprint">
@@ -324,7 +324,7 @@
         </record>
         <record id="view_scrum_meeting_form" model="ir.ui.view">
             <field name="name">Scrum Meeting</field>
-            <field name="model">scrum.meeting</field>
+            <field name="model">project.scrum.meeting</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrum Sprint">
@@ -358,8 +358,8 @@
         </record>
 
         <record id="view_scrum_meeting_search" model="ir.ui.view">
-            <field name="name">scrum.meeting.search</field>
-            <field name="model">scrum.meeting</field>
+            <field name="name">project_scrum.meeting.search</field>
+            <field name="model">project.scrum.meeting</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Scrum Sprint">
@@ -383,7 +383,7 @@
 
         <record id="action_meeting_form" model="ir.actions.act_window">
             <field name="name">Scrum Meetings</field>
-            <field name="res_model">scrum.meeting</field>
+            <field name="res_model">project.scrum.meeting</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_scrum_daily':1}</field>
@@ -405,14 +405,14 @@
         </record>
         <record id="ir_scrum_sprint_open_task" model="ir.values">
             <field eval=" 'tree_but_open'" name="key2"/>
-            <field eval="'scrum.sprint'" name="model"/>
+            <field eval="'project.scrum.sprint'" name="model"/>
             <field name="name">View sprint tasks</field>
             <field eval="'ir.actions.act_window,'+str(action_sprint_task_open)" name="value"/>
             <field eval="True" name="object"/>
         </record>
 
         <record id="action_sprint_backlog_open" model="ir.actions.act_window">
-            <field name="res_model">scrum.product.backlog</field>
+            <field name="res_model">project.scrum.product.backlog</field>
             <field name="name">View sprint backlog</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -420,7 +420,7 @@
         </record>
         <record id="ir_scrum_sprint_open_sprint" model="ir.values">
             <field eval=" 'tree_but_open'" name="key2"/>
-            <field eval="'scrum.sprint'" name="model"/>
+            <field eval="'project.scrum.sprint'" name="model"/>
             <field name="name">View sprint backlog</field>
             <field eval="'ir.actions.act_window,'+str(action_sprint_backlog_open)" name="value"/>
             <field eval="True" name="object"/>
@@ -431,7 +431,7 @@
        -->
 
         <record id="dblc_proj" model="ir.actions.act_window">
-            <field name="res_model">scrum.product.backlog</field>
+            <field name="res_model">project.scrum.product.backlog</field>
             <field name="name">View project's backlog</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -439,7 +439,7 @@
         </record>
         <record id="ir_scrum_project_backlog" model="ir.values">
             <field eval=" 'tree_but_open'" name="key2"/>
-            <field eval="'scrum.project'" name="model"/>
+            <field eval="'project.scrum.project'" name="model"/>
             <field name="name">View project's backlog</field>
             <field eval="'ir.actions.act_window,'+str(dblc_proj)" name="value"/>
             <field eval="True" name="object"/>
@@ -453,7 +453,7 @@
         </record>
         <record id="ir_scrum_project_task" model="ir.values">
             <field eval=" 'tree_but_open'" name="key2"/>
-            <field eval="'scrum.project'" name="model"/>
+            <field eval="'project.scrum.project'" name="model"/>
             <field name="name">View project's tasks</field>
             <field eval="'ir.actions.act_window,'+str(dblc_proj2)" name="value"/>
             <field eval="True" name="object"/>
@@ -509,6 +509,7 @@
                 <field name="project_id" position="after">
                     <field name="sprint_id" context="{'sprint_invisible':False}">
                         <filter icon="terp-check" string="Current" context="{'sprint_invisible':False}" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
+                        <filter icon="terp-check" string="Current" context="{'sprint_invisible':False}" domain="[]" help="View Sprints"/>
                     </field>
                 </field>
             </field>
@@ -532,8 +533,8 @@
             domain="[('sprint_id', '=', active_id)]"
             id="act_scrum_sprint_2_product_backlog"
             name="Backlogs"
-            res_model="scrum.product.backlog"
-            src_model="scrum.sprint"
+            res_model="project.scrum.product.backlog"
+            src_model="project.scrum.sprint"
             view_mode="tree,form"
             view_type="form"/>
 
@@ -542,7 +543,7 @@
             id="act_scrum_sprint_2_project_task"
             name="Tasks"
             res_model="project.task"
-            src_model="scrum.sprint"
+            src_model="project.scrum.sprint"
             view_mode="tree,form"
             view_type="form"/>
 
diff --git a/addons/scrum/report/__init__.py b/addons/project_scrum/report/__init__.py
similarity index 100%
rename from addons/scrum/report/__init__.py
rename to addons/project_scrum/report/__init__.py
diff --git a/addons/scrum/report/_burndown.py b/addons/project_scrum/report/_burndown.py
similarity index 100%
rename from addons/scrum/report/_burndown.py
rename to addons/project_scrum/report/_burndown.py
diff --git a/addons/scrum/report/sprint_burndown.py b/addons/project_scrum/report/sprint_burndown.py
similarity index 94%
rename from addons/scrum/report/sprint_burndown.py
rename to addons/project_scrum/report/sprint_burndown.py
index cdc837fe96b..853986c9d5f 100644
--- a/addons/scrum/report/sprint_burndown.py
+++ b/addons/project_scrum/report/sprint_burndown.py
@@ -48,9 +48,9 @@ class report_tasks(report_int):
         canv = canvas.init(fname=io, format='pdf')
         canv.set_author("Open ERP")
 
-        cr.execute('select id,date_start,date_stop from scrum_sprint where id=%s', (datas['id'],))
+        cr.execute('select id,date_start,date_stop from project_scrum_sprint where id=%s', (datas['id'],))
         for (id,date_start,date_stop) in cr.fetchall():
-            cr.execute('select id from project_task where product_backlog_id in(select id from scrum_product_backlog where sprint_id=%s)', (id,))
+            cr.execute('select id from project_task where product_backlog_id in(select id from project_scrum_product_backlog where sprint_id=%s)', (id,))
 
             ids = map(lambda x: x[0], cr.fetchall())
             datas = _burndown.compute_burndown(cr, uid, ids, date_start, date_stop)
diff --git a/addons/scrum/report/task_burndown.py b/addons/project_scrum/report/task_burndown.py
similarity index 100%
rename from addons/scrum/report/task_burndown.py
rename to addons/project_scrum/report/task_burndown.py
diff --git a/addons/project_scrum/security/ir.model.access.csv b/addons/project_scrum/security/ir.model.access.csv
new file mode 100644
index 00000000000..752e834b1e0
--- /dev/null
+++ b/addons/project_scrum/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_scrum_sprint","project_scrum.sprint","model_project_scrum_sprint","project.group_project_user",1,0,0,0
+"access_scrum_product_backlog","project_scrum.product.backlog","model_project_scrum_product_backlog","project.group_project_user",1,1,1,1
+"access_scrum_meeting","project_scrum.meeting","model_project_scrum_meeting","project.group_project_user",1,0,0,0
+"access_scrum_meeting_manager","project_scrum.meeting.manager","model_project_scrum_meeting","project.group_project_manager",1,1,1,1
+"access_scrum_sprint_manager","project_scrum.sprint.manager","model_project_scrum_sprint","project.group_project_manager",1,1,1,1
+"access_scrum_product_backlog_manager","project_scrum.product.backlog manager","model_project_scrum_product_backlog","project.group_project_manager",1,1,1,1
+"access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
+"access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0
diff --git a/addons/scrum/wizard/__init__.py b/addons/project_scrum/wizard/__init__.py
similarity index 90%
rename from addons/scrum/wizard/__init__.py
rename to addons/project_scrum/wizard/__init__.py
index bcced59f96b..92ed57d7d7e 100644
--- a/addons/scrum/wizard/__init__.py
+++ b/addons/project_scrum/wizard/__init__.py
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-import scrum_backlog_create_task
-import scrum_backlog_sprint
-import scrum_backlog_merger
+import project_scrum_backlog_create_task
+import project_scrum_backlog_sprint
+import project_scrum_backlog_merger
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/scrum/wizard/scrum_backlog_create_task.py b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
similarity index 95%
rename from addons/scrum/wizard/scrum_backlog_create_task.py
rename to addons/project_scrum/wizard/project_scrum_backlog_create_task.py
index fcade59bc2f..9fcf104211e 100644
--- a/addons/scrum/wizard/scrum_backlog_create_task.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
@@ -21,7 +21,7 @@
 from osv import osv, fields
 
 class backlog_create_task(osv.osv_memory):
-    _name = 'backlog.create.task'
+    _name = 'project.scrum.backlog.create.task'
     _description = 'Create Tasks from Product Backlogs'
     _columns = {
         'user_id': fields.many2one('res.users', 'Assign To')
@@ -30,7 +30,7 @@ class backlog_create_task(osv.osv_memory):
     def do_create(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         task = self.pool.get('project.task')
-        backlog_id = self.pool.get('scrum.product.backlog')
+        backlog_id = self.pool.get('project.scrum.product.backlog')
         ids_task = []
 
         if context is None:
diff --git a/addons/scrum/wizard/scrum_backlog_create_task_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
similarity index 77%
rename from addons/scrum/wizard/scrum_backlog_create_task_view.xml
rename to addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
index 25cc78b873f..0ec3ab736af 100644
--- a/addons/scrum/wizard/scrum_backlog_create_task_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
@@ -3,8 +3,8 @@
     <data>
 
 		<record id="view_scrum_backlog_to_task" model="ir.ui.view">
-            <field name="name">backlog.create.task.form</field>
-            <field name="model">backlog.create.task</field>
+            <field name="name">project.scrum.backlog.create.task.form</field>
+            <field name="model">project.scrum.backlog.create.task</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Create Tasks">
@@ -23,21 +23,21 @@
         <record id="action_scrum_backlog_to_task" model="ir.actions.act_window">
             <field name="name">Create Tasks</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">backlog.create.task</field>
+            <field name="res_model">project.scrum.backlog.create.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
 
 		<record model="ir.values" id="scrum_backlog_to_task_values">
-            <field name="model_id" ref="model_scrum_product_backlog" />
+            <field name="model_id" ref="model_project_scrum_product_backlog" />
             <field name="object" eval="1" />
             <field name="name">Create Tasks</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_scrum_backlog_to_task'))" />
             <field name="key">action</field>
-            <field name="model">scrum.product.backlog</field>
+            <field name="model">project.scrum.product.backlog</field>
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/scrum/wizard/scrum_backlog_merger.py b/addons/project_scrum/wizard/project_scrum_backlog_merger.py
similarity index 93%
rename from addons/scrum/wizard/scrum_backlog_merger.py
rename to addons/project_scrum/wizard/project_scrum_backlog_merger.py
index 8d7d38633c7..eb31ebe031c 100644
--- a/addons/scrum/wizard/scrum_backlog_merger.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_merger.py
@@ -21,15 +21,15 @@
 from osv import osv, fields
 from tools.translate import _
 
-class scrum_backlog_merge(osv.osv_memory):
-    _name = 'scrum.backlog.merge'
+class project_scrum_backlog_merge(osv.osv_memory):
+    _name = 'project.scrum.backlog.merge'
     _description = 'Merge Product Backlogs'
     _columns = {
         'project_id': fields.many2one('project.project', 'Project', help="Select project for the new product backlog"),
                }
 
     def check_backlogs(self, cr, uid, ids, context=None):
-        backlog_obj = self.pool.get('scrum.product.backlog')
+        backlog_obj = self.pool.get('project.scrum.product.backlog')
         mod_obj = self.pool.get('ir.model.data')
         p_list = []
         if context is None:
@@ -50,7 +50,7 @@ class scrum_backlog_merge(osv.osv_memory):
                 'context': context,
                 'view_type': 'form',
                 'view_mode': 'form',
-                'res_model': 'scrum.backlog.merge',
+                'res_model': 'project.scrum.backlog.merge',
                 'views': [(resource_id,'form')],
                 'type': 'ir.actions.act_window',
                 'target': 'new',
@@ -58,7 +58,7 @@ class scrum_backlog_merge(osv.osv_memory):
         return self.do_merge(cr, uid, ids, context=context)
 
     def do_merge(self, cr, uid, ids, context=None):
-        backlog_obj = self.pool.get('scrum.product.backlog')
+        backlog_obj = self.pool.get('project.scrum.product.backlog')
         task_obj = self.pool.get('project.task')
         task_lines = []
         new_exp_hour = []
@@ -99,5 +99,5 @@ class scrum_backlog_merge(osv.osv_memory):
         backlog_obj.unlink(cr, uid, context['active_ids'], context=context)
         return {}
 
-scrum_backlog_merge()
+project_scrum_backlog_merge()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/scrum/wizard/scrum_backlog_merger_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
similarity index 86%
rename from addons/scrum/wizard/scrum_backlog_merger_view.xml
rename to addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
index 849f6099908..9e374d9437b 100644
--- a/addons/scrum/wizard/scrum_backlog_merger_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
@@ -3,7 +3,7 @@
     <data>
         <record id="scrum_backlog_merge_view" model="ir.ui.view">
             <field name="name">Merge Backlogs</field>
-            <field name="model">scrum.backlog.merge</field>
+            <field name="model">project.scrum.backlog.merge</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge Backlogs">
@@ -19,7 +19,7 @@
         <record id="action_scrum_backlog_merge" model="ir.actions.act_window">
             <field name="name">Merge Backlogs</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">scrum.backlog.merge</field>
+            <field name="res_model">project.scrum.backlog.merge</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -27,18 +27,18 @@
         </record>
 
         <record model="ir.values" id="scrum_backlog_merge_values">
-            <field name="model_id" ref="model_scrum_product_backlog" />
+            <field name="model_id" ref="model_project_scrum_product_backlog" />
             <field name="object" eval="1" />
             <field name="name">Merge Backlogs</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_scrum_backlog_merge'))" />
             <field name="key">action</field>
-            <field name="model">scrum.product.backlog</field>
+            <field name="model">project.scrum.product.backlog</field>
         </record>
 
         <record id="scrum_merge_project_id_view" model="ir.ui.view">
             <field name="name">Merge Backlogs</field>
-            <field name="model">scrum.backlog.merge</field>
+            <field name="model">project.scrum.backlog.merge</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge Backlogs">
diff --git a/addons/scrum/wizard/scrum_backlog_sprint.py b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
similarity index 92%
rename from addons/scrum/wizard/scrum_backlog_sprint.py
rename to addons/project_scrum/wizard/project_scrum_backlog_sprint.py
index 308ac75795e..5d4a6831533 100644
--- a/addons/scrum/wizard/scrum_backlog_sprint.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
@@ -22,10 +22,10 @@ from osv import osv, fields
 from tools.translate import _
 
 class backlog_sprint_assign(osv.osv_memory):
-    _name = 'backlog.assign.sprint'
+    _name = 'project.scrum.backlog.assign.sprint'
     _description = 'Assign sprint to backlogs'
     _columns = {
-        'sprint_id': fields.many2one('scrum.sprint', 'Sprint Name', required=True),
+        'sprint_id': fields.many2one('project.scrum.sprint', 'Sprint Name', required=True),
         'state_open': fields.boolean('Set Open', help="Change the state of product backlogs to open if its in draft state"),
         'convert_to_task': fields.boolean('Convert To Task', help="Create Task for Product Backlog")
                }
@@ -35,8 +35,8 @@ class backlog_sprint_assign(osv.osv_memory):
                  }
 
     def assign_sprint(self, cr, uid, ids, context=None):
-        backlog_obj = self.pool.get('scrum.product.backlog')
-        sprint_obj = self.pool.get('scrum.sprint')
+        backlog_obj = self.pool.get('project.scrum.product.backlog')
+        sprint_obj = self.pool.get('project.scrum.sprint')
         task = self.pool.get('project.task')
         backlog_ids = []
         if context is None:
diff --git a/addons/scrum/wizard/scrum_backlog_sprint_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
similarity index 80%
rename from addons/scrum/wizard/scrum_backlog_sprint_view.xml
rename to addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
index d9806d4aff0..b4942cf27a6 100644
--- a/addons/scrum/wizard/scrum_backlog_sprint_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
@@ -3,8 +3,8 @@
     <data>
 
 		<record id="view_scrum_backlog_to_sprint" model="ir.ui.view">
-			<field name="name">backlog.assign.sprint.form</field>
-			<field name="model">backlog.assign.sprint</field>
+			<field name="name">project.scrum.backlog.assign.sprint.form</field>
+			<field name="model">project.scrum.backlog.assign.sprint</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Assign Sprint">
@@ -30,20 +30,20 @@
         <record id="action_scrum_backlog_to_sprint" model="ir.actions.act_window">
             <field name="name">Assign Sprint</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">backlog.assign.sprint</field>
+            <field name="res_model">project.scrum.backlog.assign.sprint</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
 
 		<record model="ir.values" id="scrum_backlog_to_sprint_values">
-            <field name="model_id" ref="model_scrum_product_backlog" />
+            <field name="model_id" ref="model_project_scrum_product_backlog" />
             <field name="object" eval="1" />
             <field name="name">Assign Sprint</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_scrum_backlog_to_sprint'))" />
             <field name="key">action</field>
-            <field name="model">scrum.product.backlog</field>
+            <field name="model">project.scrum.product.backlog</field>
         </record>
 
 	</data>
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 009d83a03fd..3dd6600efc9 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -28,7 +28,7 @@
         the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'project', 'hr_timesheet_sheet'],
     'init_xml': [],
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 6fd2beb8475..3da8c45376b 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -62,6 +62,7 @@ class project_work(osv.osv):
         obj_timesheet = self.pool.get('hr.analytic.timesheet')
         task_obj = self.pool.get('project.task')
         vals_line = {}
+        context = kwargs.get('context', {})
         obj_task = task_obj.browse(cr, uid, vals['task_id'])
         result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
         vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name']) or '/')
@@ -69,78 +70,83 @@ class project_work(osv.osv):
         vals_line['product_id'] = result['product_id']
         vals_line['date'] = vals['date'][:10]
         vals_line['unit_amount'] = vals['hours']
-        acc_id = obj_task.project_id.category_id.id
+        acc_id = obj_task.project_id.analytic_account_id.id
         vals_line['account_id'] = acc_id
         res = obj_timesheet.on_change_account_id(cr, uid, False, acc_id)
         if res.get('value'):
             vals_line.update(res['value'])
         vals_line['general_account_id'] = result['general_account_id']
         vals_line['journal_id'] = result['journal_id']
-        vals_line['amount'] = 00.0
+        vals_line['amount'] = 0.0
         vals_line['product_uom_id'] = result['product_uom_id']
         amount = vals_line['unit_amount']
         prod_id = vals_line['product_id']
         unit = False
-        timeline_id = obj_timesheet.create(cr, uid, vals=vals_line, context=kwargs['context'])
+        timeline_id = obj_timesheet.create(cr, uid, vals=vals_line, context=context)
 
         # Compute based on pricetype
         amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
-            prod_id, amount, unit, context=kwargs['context'])
-        if amount_unit:
-            vals_line['amount'] = (-1) * vals['hours']* (amount_unit.get('value',{}).get('amount',0.0) or 0.0)
-        obj_timesheet.write(cr, uid, [timeline_id], vals_line, {})
+            prod_id, amount, unit, context=context)
+        if amount_unit and 'amount' in amount_unit.get('value',{}):
+            updv = { 'amount': amount_unit['value']['amount'] * (-1.0) }
+            obj_timesheet.write(cr, uid, [timeline_id], updv, context=context)
         vals['hr_analytic_timesheet_id'] = timeline_id
         return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
 
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
-        vals_line = {}
         obj = self.pool.get('hr.analytic.timesheet')
         timesheet_obj = self.pool.get('hr.analytic.timesheet')
-        task = self.pool.get('project.task.work').browse(cr, uid, ids, context=context)[0]
-        line_id = task.hr_analytic_timesheet_id
-        # in case,if a record is deleted from timesheet,but we change it from tasks!
-        list_avail_ids = timesheet_obj.search(cr, uid, [], context=context)
-        if line_id in list_avail_ids:
+        if isinstance(ids, (long, int)):
+            ids = [ids,]
+
+        for task in self.browse(cr, uid, ids, context=context):
+            line_id = task.hr_analytic_timesheet_id
+            if not line_id:
+                # if a record is deleted from timesheet, the line_id will become
+                # null because of the foreign key on-delete=set null
+                continue
+            vals_line = {}
             if 'name' in vals:
                 vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
             if 'user_id' in vals:
                 vals_line['user_id'] = vals['user_id']
                 result = self.get_user_related_details(cr, uid, vals['user_id'])
-                vals_line['product_id'] = result['product_id']
-                vals_line['general_account_id'] = result['general_account_id']
-                vals_line['journal_id'] = result['journal_id']
-                vals_line['product_uom_id'] = result['product_uom_id']
+                for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
+                    if result.get(fld, False):
+                        vals_line[fld] = result[fld]
+                        
             if 'date' in vals:
                 vals_line['date'] = vals['date'][:10]
             if 'hours' in vals:
                 vals_line['unit_amount'] = vals['hours']
+                prod_id = vals_line.get('product_id', line_id.product_id.id) # False may be set
                 # Compute based on pricetype
-                unit = False
-                amount_unit=obj.on_change_unit_amount(cr, uid, line_id,
-                    vals_line['product_id'], vals_line['unit_amount'], unit, context=context)
-                
-                if amount_unit:
-                     vals_line['amount'] = (-1) * vals['hours'] * (amount_unit.get('value',{}).get('amount',0.0) or 0.0)
-                     
-            obj.write(cr, uid, [line_id], vals_line, context=context)
+                amount_unit = obj.on_change_unit_amount(cr, uid, line_id.id,
+                    prod_id=prod_id,
+                    unit_amount=vals_line['unit_amount'], unit=False, context=context)
 
+                if amount_unit and 'amount' in amount_unit.get('value',{}):
+                    vals_line['amount'] = amount_unit['value']['amount'] * (-1.0)
+
+            obj.write(cr, uid, [line_id.id], vals_line, context=context)
+            
         return super(project_work,self).write(cr, uid, ids, vals, context)
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
-        pool_analytic_timesheet = self.pool.get('hr.analytic.timesheet')
-        for work_id in ids:
-            timesheet_id = self.read(cr, uid, work_id, ['hr_analytic_timesheet_id'])['hr_analytic_timesheet_id']
+        hat_obj = self.pool.get('hr.analytic.timesheet')
+        hat_ids = []
+        for task in self.browse(cr, uid, ids):
+            if task.hr_analytic_timesheet_id:
+                hat_ids.append(task.hr_analytic_timesheet_id)
 #            delete entry from timesheet too while deleting entry to task.
-            list_avail_ids = pool_analytic_timesheet.search(cr, uid, [])
-            if timesheet_id in list_avail_ids:
-                obj = pool_analytic_timesheet.unlink(cr, uid, [timesheet_id], *args, **kwargs)
-
+        if hat_ids:
+            hat_obj.unlink(cr, uid, hat_ids, *args, **kwargs)
         return super(project_work,self).unlink(cr, uid, ids, *args, **kwargs)
 
     _columns={
-        'hr_analytic_timesheet_id':fields.integer('Related Timeline Id')
+        'hr_analytic_timesheet_id':fields.many2one('hr.analytic.timesheet','Related Timeline Id', ondelete='set null'),
     }
 
 project_work()
@@ -165,7 +171,7 @@ class task(osv.osv):
             task_obj_l = self.browse(cr, uid, ids, context)
             if (vals.has_key('project_id') and vals['project_id']):
                 project_obj = self.pool.get('project.project').browse(cr, uid, vals['project_id'])
-                acc_id = project_obj.category_id.id
+                acc_id = project_obj.analytic_account_id.id
 
             for task_obj in task_obj_l:
                 if len(task_obj.work_ids):
@@ -188,7 +194,7 @@ class project_project(osv.osv):
             context = {}
         result = []
         for project in self.browse(cr, user, ids, context):
-            name = "[%s] %s" % (project.category_id and project.category_id.code or '?', project.name)
+            name = "[%s] %s" % (project.analytic_account_id and project.analytic_account_id.code or '?', project.name)
             result.append((project.id, name))
         return result
 
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 479155f0932..423bd090d24 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -33,7 +33,7 @@
     * Graph for quantity and amount per month    
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'account', 'stock', 'process', 'procurement'],
     'data': [
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 10e35e0e04c..1a90dc49e92 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -5,7 +5,6 @@
         <menuitem
             id="menu_purchase_deshboard"
             name="Dashboard"
-            icon="terp-graph"
             parent="base.next_id_73" sequence="0"/>
 
         <record id="purchase_draft" model="ir.actions.act_window">
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index 6109fb02cbf..52b40757f9b 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.po
@@ -8,13 +8,14 @@ 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"
-"PO-Revision-Date: 2009-10-02 17:40+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"PO-Revision-Date: 2010-07-15 22:07+0000\n"
+"Last-Translator: Renato Lima - http://www.akretion.com "
+"<renatonlima@gmail.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-06-22 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-07-17 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -30,42 +31,42 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,location_id:0
 msgid "Destination"
-msgstr ""
+msgstr "Destino"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
-msgstr ""
+msgstr "Da Lista de Separação"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Validated By"
-msgstr ""
+msgstr "Validado Por"
 
 #. module: purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação"
 
 #. module: purchase
 #: field:purchase.order,partner_id:0
 msgid "Supplier"
-msgstr ""
+msgstr "Fornecedor"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr ""
+msgstr "Entrega"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantidade"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Order"
-msgstr ""
+msgstr "Da Ordem"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
@@ -97,7 +98,7 @@ msgstr ""
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -114,12 +115,12 @@ msgstr ""
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase Process"
-msgstr ""
+msgstr "Processo de Compras"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 msgid "Invoice from Packing list"
-msgstr ""
+msgstr "Faturar a partir da lista de Separação"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -153,6 +154,7 @@ msgstr "Notas"
 #. module: purchase
 #: rml:purchase.order:0
 #: field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
 msgstr ""
@@ -293,7 +295,7 @@ msgstr ""
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr ""
+msgstr "RFQ"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -876,3 +878,56 @@ msgstr ""
 #: view:purchase.order.line:0
 msgid "Stock Moves"
 msgstr ""
+
+#, python-format
+#~ msgid "No Pricelist !"
+#~ msgstr "Sem Lista de Preços !"
+
+#, python-format
+#~ msgid "Wrong Product UOM !"
+#~ msgstr "UdM do Produto errada !"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Erro !"
+
+#, python-format
+#~ msgid "Invalid action !"
+#~ msgstr "Ação Inválida !"
+
+#, 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"
+
+#, python-format
+#~ msgid "Could not cancel this purchase order !"
+#~ msgstr "Não é possível cancelar esta ordem de compra!"
+
+#, 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."
+#~ msgstr ""
+#~ "Primeiro deve-se cancelar todas as faturas associadas a esta ordem  de "
+#~ "compra."
+
+#, 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)"
+
+#, 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."
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index dfdf85080fe..e7f5473b42a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -81,7 +81,7 @@ class purchase_order(osv.osv):
         res={}
         purchase_obj=self.browse(cr, uid, ids, context=context)
         for purchase in purchase_obj:
-            res[purchase.id] = False
+            res[purchase.id] = time.strftime('%Y-%m-%d %H:%M:%S')
             if purchase.order_line:
                 min_date=purchase.order_line[0].date_planned
                 for line in purchase.order_line:
@@ -311,7 +311,7 @@ class purchase_order(osv.osv):
             'product_id': ol.product_id.id or False,
             'uos_id': ol.product_uom.id or False,
             'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])],
-            'account_analytic_id': ol.account_analytic_id.id,
+            'account_analytic_id': ol.account_analytic_id.id or False,
         })
 
     def action_cancel_draft(self, cr, uid, ids, *args):
@@ -344,7 +344,7 @@ class purchase_order(osv.osv):
                     if not a:
                         raise osv.except_osv(_('Error !'), _('There is no expense account defined for this product: "%s" (id:%d)') % (ol.product_id.name, ol.product_id.id,))
                 else:
-                    a = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
+                    a = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category').id
                 fpos = o.fiscal_position or False
                 a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
                 il.append(self.inv_line_create(cr, uid, a, ol))
@@ -746,23 +746,24 @@ class procurement_order(osv.osv):
         po_obj = self.pool.get('purchase.order')
         for procurement in self.browse(cr, uid, ids):
             res_id = procurement.move_id.id
-            partner = procurement.product_id.seller_ids[0].name
+            partner = procurement.product_id.seller_id # Taken Main Supplier of Product of Procurement.
+            seller_qty = procurement.product_id.seller_qty
+            seller_delay = int(procurement.product_id.seller_delay)
             partner_id = partner.id
-            partner_rec = procurement.product_id.seller_ids[0]
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             pricelist_id = partner.property_product_pricelist_purchase.id
 
             uom_id = procurement.product_id.uom_po_id.id
 
             qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
-            if procurement.product_id.seller_ids[0].qty:
-                qty = max(qty,partner_rec.qty)
+            if seller_qty:
+                qty = max(qty,seller_qty)
 
             price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id]
 
             newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
             newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
-            newdate = newdate - partner_rec.delay
+            newdate = newdate - seller_delay
 
             #Passing partner_id to context for purchase order line integrity of Line name
             context.update({'lang': partner.lang, 'partner_id': partner_id})
diff --git a/addons/purchase/test/procurement_buy.yml b/addons/purchase/test/procurement_buy.yml
index 011e70d0cdc..69b4f1d6195 100644
--- a/addons/purchase/test/procurement_buy.yml
+++ b/addons/purchase/test/procurement_buy.yml
@@ -23,6 +23,7 @@
       - delay: 1
         name: base.res_partner_asus
         qty: 5.0
+        min_qty:1.0
 -  
   I create  procurement order.
 - 
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
index 3e195935f3a..2c0a24d0f65 100644
--- a/addons/purchase/wizard/purchase_installer.py
+++ b/addons/purchase/wizard/purchase_installer.py
@@ -26,6 +26,7 @@ class purchase_installer(osv.osv_memory):
 
     _columns = {
         'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allow you to easily keep track and manage all your purchase orders."),
+        'purchase_analytic_plans': fields.boolean('Purchase Analytic Plans',help="Manages analytic distribution and purchase orders.")
         }
 purchase_installer()
 
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 635297d0f21..dc10beacd98 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -20,13 +20,14 @@
 	          </separator>
 	          <xpath expr="//label[@string='description']"
 	                 position="attributes">
-	            <attribute name="string">After having installed the core purchase application, you can extend it with more modules on needs of your organization</attribute>
+	            <attribute name="string">In this page, you can extend your purchase system with purchase requisition facility and analytic distribution of purchase orders.</attribute>
 	          </xpath>
               <xpath expr="//button[@string='Install Modules']" position="attributes">
                    <attribute name="string">Configure</attribute>
                </xpath>
                 <group colspan="8">
                   <field name="purchase_requisition"/>
+                  <field name="purchase_analytic_plans"/>
                 </group>
               </data>
             </field>
diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py
index 88dff2cdc57..743dce1006a 100644
--- a/addons/purchase_analytic_plans/__openerp__.py
+++ b/addons/purchase_analytic_plans/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,7 +27,7 @@
     'description': """
     The base module to manage analytic distribution and purchase orders.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['purchase', 'account_analytic_plans'],
     'init_xml': [],
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index d707af0e50d..f4c8942bf47 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -20,7 +20,7 @@
 {
     "name" : "Purchase - Purchase Requisition",
     "version" : "0.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Generic Modules/Sales & Purchases",
     "website" : "http://www.openerp.com",
     "description": """
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index f36973f740b..7e002bf03bf 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Reporting Tools",
     "version" : "1.0",
     "depends" : ["base"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": "Tools",
     "description": """Installer for reporting tools selection
     """,
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
index 2eb061d1344..1dd9797a68b 100644
--- a/addons/report_designer/installer.py
+++ b/addons/report_designer/installer.py
@@ -26,9 +26,17 @@ class report_designer_installer(osv.osv_memory):
 
     _columns = {
         # Reporting
-        'base_report_designer':fields.boolean('OpenOffice Report Designer'),
-        'base_report_creator':fields.boolean('Query Builder'),
-        'olap':fields.boolean('Business Intelligence Report'),
+        'base_report_designer':fields.boolean('OpenOffice Report Designer',help="This module adds wizards to import/export .SXW report that "
+                                "you can modify in OpenOffice.Once you have modified it you can "
+                                "upload the report using the same wizard."),
+        'base_report_creator':fields.boolean('Query Builder',help="his module allows you to create any statistic "
+                                "reports  on several objects. It's a SQL query builder and browser for and users. "
+                                "After installation, it adds a menu to define custom report in the Dashboard menu."),
+        'olap':fields.boolean('Business Intelligence Report',help="Olap module is used to install BI module in client. Olap provides Online "
+                                "Analytical Process with the mdx query. BI provides Cube Browsing and Cube Designing. "
+                                "After installation you will get Cube Browser and Cube Desinger in Reporting Menu. "
+                                "Cube Browser is used to generate the reports with table view (mdx view) of mdx query "
+                                "and Cube designer is used to make cubes in BI."),
         }
 report_designer_installer()
 
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index de9d3af1e44..16860ef9b70 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -27,7 +27,7 @@
     'description': """
     A module that adds intrastat reports.
     This module gives the details of the goods traded between the countries of European Union """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'product', 'stock', 'sale', 'purchase'],
     'init_xml': ['report_intrastat_data.xml'],
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index 41872ca22a7..01780626db7 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name" : "Resource",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Generic Modules/Projects & Services",
     "website" : "http://www.openerp.com",
     "description": """
@@ -34,7 +34,7 @@
      It also manages the leaves of every resource.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'process'],
     'init_xml': [],
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index d8eb378b7d8..0aba6b10081 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -31,7 +31,7 @@ class resource_calendar(osv.osv):
     _columns = {
         'name' : fields.char("Name", size=64, required=True),
         'company_id' : fields.many2one('res.company', 'Company', required=False),
-        'week_id' : fields.one2many('resource.calendar.week', 'calendar_id', 'Working Time'),
+        'attendance_ids' : fields.one2many('resource.calendar.attendance', 'calendar_id', 'Working Time'),
         'manager' : fields.many2one('res.users', 'Workgroup manager'),
     }
     _defaults = {
@@ -65,7 +65,7 @@ class resource_calendar(osv.osv):
         maxrecur = 100
         current_hour = dt_from.hour
         while (todo>0) and maxrecur:
-            cr.execute("select hour_from,hour_to from resource_calendar_week where dayofweek='%s' and calendar_id=%s order by hour_from desc", (dt_from.day_of_week,id))
+            cr.execute("select hour_from,hour_to from resource_calendar_attendance where dayofweek='%s' and calendar_id=%s order by hour_from desc", (dt_from.day_of_week,id))
             for (hour_from,hour_to) in cr.fetchall():
                 leave_flag  = False
                 if (hour_from<current_hour) and (todo>0):
@@ -101,7 +101,7 @@ class resource_calendar(osv.osv):
         maxrecur = 100
         current_hour = dt_from.hour
         while (todo>0) and maxrecur:
-            cr.execute("select hour_from,hour_to from resource_calendar_week where dayofweek='%s' and calendar_id=%s order by hour_from", (dt_from.day_of_week,id))
+            cr.execute("select hour_from,hour_to from resource_calendar_attendance where dayofweek='%s' and calendar_id=%s order by hour_from", (dt_from.day_of_week,id))
             for (hour_from,hour_to) in cr.fetchall():
                 leave_flag  = False
                 if (hour_to>current_hour) and (todo>0):
@@ -136,7 +136,7 @@ class resource_calendar(osv.osv):
         current_hour = dt_from.hour
 
         while (dt_from <= dt_to):
-            cr.execute("select hour_from,hour_to from resource_calendar_week where dayofweek='%s' and calendar_id=%s order by hour_from", (dt_from.day_of_week,id))
+            cr.execute("select hour_from,hour_to from resource_calendar_attendance where dayofweek='%s' and calendar_id=%s order by hour_from", (dt_from.day_of_week,id))
             der =  cr.fetchall()
             for (hour_from,hour_to) in der:
                 if hours != 0.0:#For first time of the loop only,hours will be 0
@@ -169,8 +169,8 @@ class resource_calendar(osv.osv):
     
 resource_calendar()
 
-class resource_calendar_week(osv.osv):
-    _name = "resource.calendar.week"
+class resource_calendar_attendance(osv.osv):
+    _name = "resource.calendar.attendance"
     _description = "Work Detail"
     _columns = {
         'name' : fields.char("Name", size=64, required=True),
@@ -181,7 +181,7 @@ class resource_calendar_week(osv.osv):
         'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
     }
     _order = 'dayofweek, hour_from'
-resource_calendar_week()
+resource_calendar_attendance()
 
 class resource_resource(osv.osv):
     _name = "resource.resource"
diff --git a/addons/resource/resource_demo.xml b/addons/resource/resource_demo.xml
index b70728ea9ad..2d1b6622e07 100644
--- a/addons/resource/resource_demo.xml
+++ b/addons/resource/resource_demo.xml
@@ -8,70 +8,70 @@
             <field name="name">38 Hours/Week</field>
         </record>
 
-        <record model="resource.calendar.week">
+        <record model="resource.calendar.attendance">
             <field name="name">Monday morning</field>
             <field name="dayofweek">0</field>
             <field name="hour_from">08</field>
             <field name="hour_to">12</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.week">
+        <record model="resource.calendar.attendance">
             <field name="name">Monday evening</field>
             <field name="dayofweek">0</field>
             <field name="hour_from">13</field>
             <field name="hour_to">18</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.week">
+        <record model="resource.calendar.attendance">
             <field name="name">Tuesday morning</field>
             <field name="dayofweek">1</field>
             <field name="hour_from">08</field>
             <field name="hour_to">12</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.week">
+        <record model="resource.calendar.attendance">
             <field name="name">Tuesday evening</field>
             <field name="dayofweek">1</field>
             <field name="hour_from">13</field>
             <field name="hour_to">18</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.week">
+        <record model="resource.calendar.attendance">
             <field name="name">Wednesday morning</field>
             <field name="dayofweek">2</field>
             <field name="hour_from">08</field>
             <field name="hour_to">12</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.week">
+        <record model="resource.calendar.attendance">
             <field name="name">Wednesday evening</field>
             <field name="dayofweek">2</field>
             <field name="hour_from">13</field>
             <field name="hour_to">18</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.week">
+        <record model="resource.calendar.attendance">
             <field name="name">Thursday morning</field>
             <field name="dayofweek">3</field>
             <field name="hour_from">08</field>
             <field name="hour_to">12</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.week">
+        <record model="resource.calendar.attendance">
             <field name="name">Thursday evening</field>
             <field name="hour_from">13</field>
             <field name="hour_to">18</field>
             <field name="dayofweek">3</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.week">
+        <record model="resource.calendar.attendance">
             <field name="name">Friday morning</field>
             <field name="dayofweek">4</field>
             <field name="hour_from">08</field>
             <field name="hour_to">12</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.week">
+        <record model="resource.calendar.attendance">
             <field name="name">Friday evening</field>
             <field name="dayofweek">4</field>
             <field name="hour_from">13</field>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 49e04abbe53..98afe8f5a03 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -78,8 +78,7 @@
                     <field name="name" select="1"/>
                     <field name="manager" select="1"/>
                     <field name="company_id" select="1" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field colspan="4" name="week_id" nolabel="1" widget="one2many_list"/>
+                  <!--  <field colspan="4" name="week_id" nolabel="1" widget="one2many_list"/>-->
                 </form>
             </field>
         </record>
@@ -106,9 +105,9 @@
             <field name="search_view_id" ref="view_resource_calendar_search"/>
         </record>
 
-        <record id="view_resource_calendar_week_tree" model="ir.ui.view">
-            <field name="name">resource.calendar.week.tree</field>
-            <field name="model">resource.calendar.week</field>
+        <record id="view_resource_calendar_attendance_tree" model="ir.ui.view">
+            <field name="name">resource.calendar.attendance.tree</field>
+            <field name="model">resource.calendar.attendance</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Working Time">
@@ -119,9 +118,9 @@
                 </tree>
             </field>
         </record>
-        <record id="view_resource_calendar_week_form" model="ir.ui.view">
-            <field name="name">resource.calendar.week.form</field>
-            <field name="model">resource.calendar.week</field>
+        <record id="view_resource_calendar_attendance_form" model="ir.ui.view">
+            <field name="name">resource.calendar.attendance.form</field>
+            <field name="model">resource.calendar.attendance</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Working Time">
@@ -198,6 +197,7 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_resource_resource_search"/>
+            <field name="help">There you can find clusters of your resources type involved in a specific project phase as well as their workload.</field>
         </record>
 
         <record id="resource_calendar_leave_form" model="ir.ui.view">
diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv
index 83e06121937..8d1d231a84b 100644
--- a/addons/resource/security/ir.model.access.csv
+++ b/addons/resource/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_resource_calendar","resource.calendar","model_resource_calendar","base.group_system",1,1,1,1
-"access_resource_calendar_week","resource.calendar.week","model_resource_calendar_week","base.group_system",1,1,1,1
+"access_resource_calendar_attendance","resource.calendar.attendance","model_resource_calendar_attendance","base.group_system",1,1,1,1
 "access_resource_resource","resource.resource","model_resource_resource","base.group_system",1,1,1,1
 "access_resource_resource_all","resource.resource all","model_resource_resource",,1,0,0,0
 "access_resource_calendar_leaves","resource.calendar.leaves","model_resource_calendar_leaves","base.group_system",1,1,1,1
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index 3ad30a6233e..4d8541b4ab5 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -25,6 +25,7 @@
 
 import sale
 import stock
+import sale_installer
 import product
 import wizard
 import report
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index d60b132a827..bc9e073de01 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -46,7 +46,7 @@
     * Graph of sales by product
     * Graph of cases of the month
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['product', 'stock', 'procurement', 'process','board'],
     'init_xml': [],
@@ -61,6 +61,7 @@
         'sale_sequence.xml',
         'sale_data.xml',
         'sale_view.xml',
+        'sale_installer.xml',
         'report/sale_report_view.xml',
         'sale_report.xml',
         'stock_view.xml',
@@ -69,12 +70,17 @@
     ],
     'demo_xml': ['sale_demo.xml','board_sale_demo.xml'],
     'test': [
-             'test/shipping_manual_sale_order.yml',
-             'test/prepaid_sale_order.yml',
+             'test/data_test.yml',
+             'test/manual_order_policy.yml',
+             'test/prepaid_order_policy.yml',
+             'test/picking_order_policy.yml',
+             'test/postpaid_order_policy.yml',
              'test/advance_invoice.yml',
              'test/so_make_line_invoice.yml',
              'test/so_make_invoice.yml',
              'test/sale_procurement.yml',
+             'test/invoice_on_ordered_qty.yml',
+             'test/invoice_on_shipped_qty.yml',
             ],
     'installable': True,
     'active': False,
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 0e25af519b4..b25e7e5b1b2 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -50,7 +50,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_sales_manager_form"/>
         </record>
-		<menuitem icon="terp-graph" id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
+		<menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
         <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0"/>
 
     </data>
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index 9b348b3cd84..885dfa8c4e6 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/i18n/lt.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* sale
+#	* sale
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-14 11:45+0000\n"
+"PO-Revision-Date: 2010-07-20 22:42+0000\n"
 "Last-Translator: Paulius Sladkevičius <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-06-22 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -24,12 +24,12 @@ msgstr "Dalinis pristatymas"
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Procurement"
-msgstr ""
+msgstr "Perkurti planinį užsakymą"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr "Patvirtinti pasiūlymą"
+msgstr "Patvirtinti užsakymą"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
@@ -39,7 +39,7 @@ msgstr "Pristatymo užsakymas"
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
-msgstr ""
+msgstr "Važtaraščio eil. adresas"
 
 #. module: sale
 #: constraint:ir.actions.act_window:0
@@ -49,7 +49,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Waiting Schedule"
-msgstr "Laukiama grafiko"
+msgstr "Laukiantis"
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -57,78 +57,81 @@ msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
 msgstr ""
+"Jeigu Jūs neturite pakankamai atsargų ar pritariate daliniam vežimui?"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
-msgstr "iš atsargų"
+msgstr "Iš sandėlio"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sale Order"
-msgstr ""
+msgstr "Žingsniai iki pardavimo užsakymo pristatymo"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0
+#: rml:sale.order:0
 msgid "Quantity"
 msgstr "Kiekis"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
 msgid "You invoice has been successfully created !"
-msgstr ""
+msgstr "Jūsų sąskaita faktūra buvo sukurta!"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Automatic Declaration"
-msgstr ""
+msgstr "Automatinis deklaravimas"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree3
 msgid "Uninvoiced and Delivered Lines"
-msgstr ""
+msgstr "Neužpajamuotos ir pristatymo eilutės"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Set to Draft"
-msgstr "Nustatyti kaip juodraštį"
+msgstr "Padaryti juodraščiu"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Sąskaitos faktūros klaida"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this invoice"
-msgstr ""
+msgstr "Tai yra sąrašas važtaraščių, sugeneruotų šiai sąskaitai faktūrai."
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Delivery, from the warehouse to the customer."
-msgstr ""
+msgstr "Pristatymas, iš sandėlio iki kliento."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
 msgid "sale.config.picking_policy"
-msgstr ""
+msgstr "Važtaraščių taisyklės"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
 msgid "Validate"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Make Invoice"
-msgstr ""
+msgstr "Sukurti sąskaitą faktūrą"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Tarpinė suma"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -136,134 +139,142 @@ msgid ""
 "Whenever confirm button is clicked, the draft state is moved to manual. that "
 "is, quotation is moved to  sale order."
 msgstr ""
+"Kai paspaudžiamas patvirtinimo mygtukas, juodraščio būsena yra perkeliama į "
+"patvirtintą. Tai yra, juodraštis yra perkeliamas į pardavimo užsakymą."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Nutraukti užsakymą"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
-msgstr ""
+msgstr "Atsargų judėjimas"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Manual Designation"
-msgstr ""
+msgstr "Rankinis deklaravimas"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
+#: view:sale.order:0
+#: field:sale.order,note:0
+#: view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Pastabos"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 msgid "Invoice after delivery"
-msgstr ""
+msgstr "Automatinis s/f sukūrimas po pristatymo"
 
 #. module: sale
-#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Mokesčiai"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Neto iš viso:"
 
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
-msgstr ""
+msgstr "Dokumentų generavimo metodas"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Atšauktas"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Pristatymo klaida"
 
 #. module: sale
 #: field:sale.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Iš viso"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Kilmė"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Sąskaitos adresas"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Siunčiamos prekės"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Reference"
-msgstr ""
+msgstr "Nuoroda"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr ""
+msgstr "Viskas iš karto"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
 msgid "Procurement is created after confirmation of sale order."
 msgstr ""
+"Planinis užsakymas yra sukuriamas po pardavimo užsakymo patvirtinimo."
 
 #. module: sale
-#: field:sale.order,project_id:0 field:sale.shop,project_id:0
+#: field:sale.order,project_id:0
+#: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitinė sąskaita"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "TVA :"
-msgstr ""
+msgstr "PVM :"
 
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Gavimo būdas"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Papildoma informacija"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Faksas :"
 
 #. module: sale
 #: field:sale.order.line,price_net:0
 msgid "Net Price"
-msgstr ""
+msgstr "Neto kaina"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree9
 #: model:ir.ui.menu,name:sale.menu_action_order_tree9
 msgid "My sales order in progress"
-msgstr ""
+msgstr "Vykdomi pardavimų užsakymai"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr ""
+msgstr "Kiekis (Mat. vnt.)"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -273,83 +284,90 @@ msgid ""
 "choose if you invoice based on ordered or shipped quantities. If the product "
 "is a service, shipped quantities means hours spent on the associated tasks."
 msgstr ""
+"Pardavimo užsakymas automatiškai sukuria s/f juodraštį. Užsakyti ir "
+"pristatyti kiekiai gali skirtis. Galima pasirinkti ar s/f sukuriama "
+"remiantis pristatytais ar užsakytais kiekiais. Jeigu registruojama paslauga, "
+"pristatyti kiekiai reiškia valandas, praleistas vykdant susijusias užduotis."
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Patvirtinta"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
-msgstr ""
+msgstr "Numatytasis mokėjimo terminas"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree_all
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_all
 msgid "All Sales Order"
-msgstr ""
+msgstr "Visų pardavimų užsakymai"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr ""
+msgstr "Pristatymo adresas"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr ""
+msgstr "Pristatyti kiekiai"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr ""
+msgstr "Sąskaita faktūra sukurta iš pardavimų užsakymų"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sale Shop"
-msgstr ""
+msgstr "Parduotuvė"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Sandėlis"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Order N°"
-msgstr ""
+msgstr "Užsakymo Nr."
 
 #. module: sale
-#: field:sale.order,order_line:0 view:sale.order.line:0
+#: field:sale.order,order_line:0
+#: view:sale.order.line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Užsakymo eilutės"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Nuol. (%)"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Sąskaitos eilutės"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
 msgid "Force Assignation"
-msgstr ""
+msgstr "Paskyrimas"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Neapmokestinama suma"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -357,17 +375,19 @@ msgid ""
 "Packing list is created when 'Assign' is being clicked after confirming the "
 "sale order. This transaction moves the sale order to packing list."
 msgstr ""
+"Važtaraštis yra sukuriamas paspaudus 'Priskirti', kai pardavimo užsakymas "
+"yra patvirtintas."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree8
 #: model:ir.ui.menu,name:sale.menu_action_order_tree8
 msgid "My sales order waiting Invoice"
-msgstr ""
+msgstr "Pardavimai laukiantys sąskaitos faktūros"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Pristatymo adresas :"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
@@ -375,69 +395,73 @@ msgid ""
 "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
 "will automatic create after delivery."
 msgstr ""
+"Kai pasirenkate dokumentų generavimo metodą \"Automatinis sąskaitos faktūros "
+"išrašymas po pristatymo\", ji automatiškai bus sukurta po pristatymo."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr ""
+msgstr "Pilnas pristatymas"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Manual Description"
-msgstr ""
+msgstr "Rankinis deklaravimas"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr ""
+msgstr "Kiekis (Mat. vnt.)"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree1
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree1
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr ""
+msgstr "Pardavimų užsakymų eilutės"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
-msgstr ""
+msgstr "Užsakyti kiekiai"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sale Order Procurement"
-msgstr ""
+msgstr "Pardavimų planinis užsakymas"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Packing"
-msgstr ""
+msgstr "Važtaraštis"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Iš viso :"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "Patvirtinti užsakymą"
 
 #. module: sale
 #: field:sale.order,name:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Užsakymo nuoroda"
 
 #. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
-msgstr ""
+msgstr "Atlikta"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Kainoraštis"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_shop_configuration
@@ -447,149 +471,152 @@ msgstr "Nustatymai"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on Order After Delivery"
-msgstr ""
+msgstr "Automatinis s/f sukūrimas po pristatymo"
 
 #. module: sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Netinkamas XML peržiūros struktūrai!"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Packing"
-msgstr ""
+msgstr "Susiję važtaraščiai"
 
 #. module: sale
 #: field:sale.shop,payment_account_id:0
 msgid "Payment Accounts"
-msgstr ""
+msgstr "Mokėjimo sąskaitos"
 
 #. module: sale
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
 msgstr ""
+"Klaida: Numat. Mat. Vnt. turi būti kitos kategorijos negu Pardavimo Mat. Vnt."
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Ref"
-msgstr ""
+msgstr "Kliento nuoroda"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales orders"
-msgstr ""
+msgstr "Pardavimų užsakymai"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
-msgstr ""
+msgstr "Suplanuoti užsakymai"
 
 #. module: sale
 #: view:sale.shop:0
 msgid "Payment accounts"
-msgstr ""
+msgstr "Mokėjimo sąskaitos"
 
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,create,end:0
 msgid "Close"
-msgstr ""
+msgstr "Uždaryta"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
 #: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Sąskaitos faktūros juodraštis"
 
 #. module: sale
 #: wizard_field:sale.order.line.make_invoice,init,grouped:0
 #: wizard_field:sale.order.make_invoice,init,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Grupuoti sąskaitas faktūras"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 #: model:ir.ui.menu,name:sale.menu_action_order_tree5
 msgid "All Quotations"
-msgstr ""
+msgstr "Visi juodraščiai"
 
 #. module: sale
 #: field:sale.order.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Nuolaida (%)"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "Draft customer invoice, to be reviewed by accountant."
 msgstr ""
+"Kliento sąskaitos faktūros juodraštis, kuris turi būti peržiūrėtas "
+"buhalterio."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree3
 #: model:ir.ui.menu,name:sale.menu_action_order_tree3
 msgid "Sales Order To Be Invoiced"
-msgstr ""
+msgstr "Pardavimų užsakymai skirti užpajamuoti"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Procurement for each line"
-msgstr ""
+msgstr "Planiniai užsakymai eilutėms"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree10
 #: model:ir.ui.menu,name:sale.menu_action_order_tree10
 msgid "My Quotations"
-msgstr ""
+msgstr "Mano juodraščiai"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
 msgid "Invoices"
-msgstr ""
+msgstr "Sąskaitos faktūros"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Line"
-msgstr ""
+msgstr "Užsakymo eilutės"
 
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Packing Default Policy"
-msgstr ""
+msgstr "Važtaraščių numatytosios taisyklės"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Manages the delivery and invoicing progress"
-msgstr ""
+msgstr "Valdyti pristatymo ir pajamavimo progresą."
 
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Shipping Default Policy"
-msgstr ""
+msgstr "Pristatymų numatytosios taisyklės"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
 msgid "Packaging"
-msgstr ""
+msgstr "Pakavimas"
 
 #. module: sale
 #: model:ir.module.module,shortdesc:sale.module_meta_information
 #: model:ir.ui.menu,name:sale.menu_sale_root
 msgid "Sales Management"
-msgstr ""
+msgstr "Pardavimų valdymas"
 
 #. module: sale
 #: field:sale.order.line,order_id:0
 msgid "Order Ref"
-msgstr ""
+msgstr "Užsakymo dok."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Invoice"
-msgstr ""
+msgstr "Iš naujo sukurti sąskaitą faktūrą"
 
 #. module: sale
 #: field:sale.order,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Pardavėjas"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -597,32 +624,34 @@ msgid ""
 "In sale order , procuerement for each line and it comes into the procurement "
 "order"
 msgstr ""
+"Pardavimo užsakyme, kiekviena planinė eilutė keliauja į planinį užsakymą."
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Mokesčiai:"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Išrašyta sąskaita faktūra"
 
 #. module: sale
 #: model:ir.actions.wizard,name:sale.advance_payment
 msgid "Advance Invoice"
-msgstr ""
+msgstr "Avanso sąskaita faktūra"
 
 #. module: sale
 #: field:sale.order,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Užsakymo būsena"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree2
 msgid "Uninvoiced Lines"
-msgstr ""
+msgstr "Neužpajamuotos eilutės"
 
 #. module: sale
 #: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
@@ -630,11 +659,13 @@ msgid ""
 "This Configuration step use to set default picking policy when make sale "
 "order"
 msgstr ""
+"Šis konfigūracijos žingsnis yra naudojamas nustatyti neįvykdymo politiką, "
+"kai vykdomi pardavimo užsakymai."
 
 #. module: sale
 #: model:process.process,name:sale.process_process_salesprocess0
 msgid "Sales Process"
-msgstr ""
+msgstr "Pardavimų vykdymas"
 
 #. module: sale
 #: wizard_view:sale.order.line.make_invoice,init:0
@@ -642,134 +673,137 @@ msgstr ""
 #: wizard_view:sale.order.make_invoice,init:0
 #: wizard_button:sale.order.make_invoice,init,invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Sukurti sąskaitas faktūras"
 
 #. module: sale
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Klaida: Numatytasis mat. vnt. ir pirkimo mat. vnt. turi būti tos pačios "
+"kategorijos."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree7
 #: model:ir.ui.menu,name:sale.menu_action_order_tree7
 msgid "My sales in shipping exception"
-msgstr ""
+msgstr "Pardavimai laukiantys pristatymo"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Sales Configuration"
-msgstr ""
+msgstr "Pardavimų konfigūracija"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree2
 #: model:ir.ui.menu,name:sale.menu_action_order_tree2
 msgid "Sales in Exception"
-msgstr ""
+msgstr "Pardavimų išimtys"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr ""
+msgstr "Užsakant"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Juodraštis"
 
 #. module: sale
 #: field:sale.order,invoiced:0
 msgid "Paid"
-msgstr ""
+msgstr "Apmokėta"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Procurement Corrected"
-msgstr ""
+msgstr "Planinių užsakymų ištaisymas"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Shipping & Manual Invoice"
-msgstr ""
+msgstr "Pristatymas ir rankinis s/f sukūrimas"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Sale Procurement"
-msgstr ""
+msgstr "Planiniai užsakymai"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sale Order Logistic"
-msgstr ""
+msgstr "Konfigūruoti pardavimo užsakymo logistiką"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Neapmokestinama suma"
 
 #. module: sale
 #: field:sale.order.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "Būsena"
 
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Packing Policy"
-msgstr ""
+msgstr "Važtaraščių taisyklės"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 msgid "Product sales"
-msgstr ""
+msgstr "Produkto pardavimai"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Our Salesman"
-msgstr ""
+msgstr "Pardavėjas"
 
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,init,create:0
 msgid "Create Advance Invoice"
-msgstr ""
+msgstr "Sukurti avansinę sąskaitą faktūrą"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
 msgid "One procurement for each product."
-msgstr ""
+msgstr "Vienas užsakymas kiekvienam produktui."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
 #: model:ir.ui.menu,name:sale.menu_sale_order
 msgid "Sales Orders"
-msgstr ""
+msgstr "Pardavimų užsakymai"
 
 #. module: sale
 #: field:product.product,pricelist_sale:0
 msgid "Sale Pricelists"
-msgstr ""
+msgstr "Pardavimų kainoraščiai"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "Direct Delivery"
-msgstr ""
+msgstr "Tiesioginis pristatymas"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
-msgstr ""
+msgstr "Ypatybės"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
 #: selection:sale.order,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Juodraštis"
 
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance Product"
-msgstr ""
+msgstr "Avansinės prekės"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
@@ -777,38 +811,41 @@ msgid ""
 "Invoice is created when 'Create Invoice' is being clicked after confirming "
 "the sale order. This transaction moves the sale order to invoices."
 msgstr ""
+"Sąskaita faktūra yra sukuriama, paspaudus \"Sukurti sąskaitą faktūra\", kai "
+"yra patvirtinamas pardavimo užsakymas."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Compute"
-msgstr ""
+msgstr "Skaičiuoti"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
+#: field:sale.order,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Parduotuvė"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "VAT"
-msgstr ""
+msgstr "PVM"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
 #: model:ir.ui.menu,name:sale.menu_action_order_tree4
 msgid "Sales Order in Progress"
-msgstr ""
+msgstr "Vykdomi pardavimų užsakymai"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
 msgid "Assign"
-msgstr ""
+msgstr "Priskirti"
 
 #. module: sale
 #: view:sale.order:0
 msgid "History"
-msgstr ""
+msgstr "Istorija"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -828,75 +865,79 @@ msgstr ""
 #. module: sale
 #: rml:sale.order:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Nuoroda"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Delivery Order Only"
-msgstr ""
+msgstr "Tik pristatymo užsakymas"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Sales order lines"
-msgstr ""
+msgstr "Pardavimų užsakymų eilutės"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seka"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 msgid "Sales"
-msgstr ""
+msgstr "Pardavimai"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Qty"
-msgstr ""
+msgstr "Kiekis"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Packing OUT is created for stockable products."
-msgstr ""
+msgstr "Važtaraštis yra kuriamas sandėliuojamiems produktams"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Other data"
-msgstr ""
+msgstr "Kiti duomenys"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0
+#: rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Vieneto kaina"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Fiskalinė pozicija"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Invoice address :"
-msgstr ""
+msgstr "Sąskaitos adresas :"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: field:sale.order,invoice_ids:0
 msgid "Invoice"
-msgstr ""
+msgstr "Sąskaita faktūra"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
 #: model:process.transition.action,name:sale.process_transition_action_cancel1
 #: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: wizard_button:sale.advance_payment_inv,init,end:0
-#: view:sale.config.picking_policy:0 view:sale.order.line:0
+#: view:sale.config.picking_policy:0
+#: view:sale.order.line:0
 #: wizard_button:sale.order.line.make_invoice,init,end:0
 #: wizard_button:sale.order.make_invoice,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -907,16 +948,21 @@ msgid ""
 "'Waiting Schedule' state is set when the invoice is confirmed but waiting "
 "for the scheduler to run on the date 'Date Ordered'."
 msgstr ""
+"Nurodo pardavimo užsakymo būseną. Išskyrus, būsena automatiškai nurodoma, "
+"kai atšaukiama sąskaita faktūra arba važtaraštis. Laukiama suplanuoto "
+"užsakymo būsena nustatoma, kai sąskaita faktūra patvirtinama, bet laukiama, "
+"kol data sutaps su galutine data (nurodyta pardavimo užsakyme)."
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "UoM"
-msgstr ""
+msgstr "Mato vnt."
 
 #. module: sale
 #: field:sale.order.line,number_packages:0
 msgid "Number Packages"
-msgstr ""
+msgstr "Pakuočių skaičius"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -924,79 +970,82 @@ msgid ""
 "Confirming the packing list moves them to delivery order. This can be done "
 "by clicking on 'Validate' button."
 msgstr ""
+"Patvirtinti važtaraščiai perkelia juos į pristatymo užsakymus. Tai galima "
+"padaryti, paspaudus \"Patvirtinti\" mygtuką."
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Vykdomas"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,init:0
 msgid "Advance Payment"
-msgstr ""
+msgstr "Avansinis apmokėjimas"
 
 #. module: sale
 #: 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: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
 msgid "Confirm sale order and Create invoice."
-msgstr ""
+msgstr "Patvirtinti pardavimo užsakymą ir sukurti sąskaitą faktūrą."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Packing List & Delivery Order"
-msgstr ""
+msgstr "Važtaraštis ir pristatymo užsakymas"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
-msgstr ""
+msgstr "Išimtis"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sale Order Lines"
-msgstr ""
+msgstr "Pardavimo užsakymo eilutės"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.order:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Sukurti sąskaitą faktūrą"
 
 #. module: sale
 #: wizard_view:sale.order.line.make_invoice,init:0
 #: wizard_view:sale.order.make_invoice,init:0
 msgid "Do you really want to create the invoices ?"
-msgstr ""
+msgstr "Ar jūs tikrai norite sukurti sąskaitas faktūras?"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Invoice based on packing lists"
-msgstr ""
+msgstr "Sąskaita faktūra pagrįsta žiniaraščiu."
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Set Default"
-msgstr ""
+msgstr "Nustatyti numatytąją reikšmę"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales order"
-msgstr ""
+msgstr "Pardavimų užsakymas"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Quotation (A sale order in draft state)"
-msgstr ""
+msgstr "Juodraštis (Pardavimo užsakymas juodraščio būsenoje)."
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "Sale Invoice"
-msgstr ""
+msgstr "Užpajamuoti pardavimą"
 
 #. module: sale
 #: field:sale.order,incoterm:0
@@ -1007,133 +1056,137 @@ msgstr ""
 #: wizard_field:sale.advance_payment_inv,init,product_id:0
 #: field:sale.order.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produktas"
 
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,create,open:0
 msgid "Open Advance Invoice"
-msgstr ""
+msgstr "Atverti avansinę sąskaitą faktūrą"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
-msgstr ""
+msgstr "Užsakymo kontaktas"
 
 #. module: sale
-#: rml:sale.order:0 field:sale.order.line,name:0
+#: rml:sale.order:0
+#: field:sale.order.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "Aprašymas"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Price"
-msgstr ""
+msgstr "Kaina"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Deliver"
-msgstr ""
+msgstr "Pristatymas"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
-msgstr ""
+msgstr "Pasiūlymas / Užsakymas"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Quotation N°"
-msgstr ""
+msgstr "Užsakymo Nr."
 
 #. module: sale
 #: field:stock.move,sale_line_id:0
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Pardavimų užsakymo eilutės"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
 msgid "Cancel Assignation"
-msgstr ""
+msgstr "Atšaukti paskyrimą"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice from the Packing"
-msgstr ""
+msgstr "Rankinis s/f generavimas iš važtaraščio"
 
 #. module: sale
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
 msgid "Make invoices"
-msgstr ""
+msgstr "Sukurti sąskaitą faktūrą"
 
 #. module: sale
 #: help:sale.order,partner_order_id:0
 msgid ""
 "The name and address of the contact that requested the order or quotation."
-msgstr ""
+msgstr "Nurodomas adresas iš partnerio kortelės."
 
 #. module: sale
-#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Klientas"
 
 #. module: sale
 #: field:product.product,pricelist_purchase:0
 msgid "Purchase Pricelists"
-msgstr ""
+msgstr "Pirkimų kainoraštis"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Pardavimo užsakymas"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
 msgid "Name"
-msgstr ""
+msgstr "Pavadinimas"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
-msgstr ""
+msgstr "Užpajamuojama"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree_new
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_new
 msgid "New Quotation"
-msgstr ""
+msgstr "Naujas užsakymas"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total amount"
-msgstr ""
+msgstr "Iš viso"
 
 #. module: sale
-#: rml:sale.order:0 field:sale.order,date_order:0
+#: rml:sale.order:0
+#: field:sale.order,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Užsakymo data"
 
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "Produktas"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "Vykdomas"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "Produkto mat. vnt."
 
 #. module: sale
 #: help:sale.config.picking_policy,step:0
@@ -1143,51 +1196,55 @@ msgid ""
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
 msgstr ""
+"Open \"ERP sugeba valdyti sudėtingas technines korteles ir produktus savo "
+"sandėlyje ir kitose vietose. Tai padės nustatyti paprastus metodus, kuriais "
+"siekiama pristatyti produktus klientui per vieną ar dvi darbuotojo "
+"operacijas."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sale Order"
-msgstr ""
+msgstr "Konfigūruoti važtaraščio taisykles paradavimo užsakymuose"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_order0
 msgid "Order"
-msgstr ""
+msgstr "Užsakymas"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "Mokėjimo terminas"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Invoice Corrected"
-msgstr ""
+msgstr "Sąskaita faktūra pataisyta"
 
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Delay"
-msgstr ""
+msgstr "Pristatymo užlaikymas"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Related invoices"
-msgstr ""
+msgstr "Susijusios sąskaitos faktūros"
 
 #. module: sale
 #: field:sale.shop,name:0
 msgid "Shop Name"
-msgstr ""
+msgstr "Parduotuvės pavadinimas"
 
 #. module: sale
 #: field:sale.order,payment_term:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Mokėjimo terminas"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
-msgstr ""
+msgstr "Apmokėjimas prieš pristatymą"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1196,57 +1253,62 @@ msgid ""
 "The same sale order may have been invoiced in several times (by line for "
 "example)."
 msgstr ""
+"Sąrašas visų sąskaitų faktūrų, kurios buvo sugeneruotos šio pardavimo "
+"užsakymo. Tas pats pardavimo užsakymas gali būti pajamuojamas kelis kartus "
+"(pvz. pagal eilutes)"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "States"
-msgstr ""
+msgstr "Būsenos"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Svoris"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "After confirming order, Create the invoice."
-msgstr ""
+msgstr "Patvirtinę užsakymą, sukurkite sąskaitą faktūrą."
 
 #. module: sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Klaida: Netinkamas EAN kodas"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0
+#: field:sale.order,shipped:0
 msgid "Picked"
-msgstr ""
+msgstr "Pristatyta"
 
 #. module: sale
 #: view:sale.shop:0
 msgid "Accounting"
-msgstr ""
+msgstr "Sąskaita"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
-msgstr ""
+msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Atsargų judėjimas"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 #: model:ir.ui.menu,name:sale.menu_action_order_tree
 msgid "My Sales Order"
-msgstr ""
+msgstr "Mano pardavimų užsakymai"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
-msgstr ""
+msgstr "Pardavimo užsakymo eilutė"
 
 #. module: sale
 #: model:ir.module.module,shortdesc:sale.module_meta_information
@@ -1288,3 +1350,294 @@ msgstr ""
 #: view:board.board:0
 msgid "Top ten sales of the month"
 msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr ""
+
+#. module: sale
+#: model:ir.report.custom,name:sale.ir_report_custom_6
+#: model:ir.report.custom,title:sale.ir_report_custom_6
+msgid "Monthly cumulated sales turnover over one year"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_turnover_product_tree
+#: model:ir.model,name:sale.model_report_turnover_per_product
+#: view:report.turnover.per.product:0
+msgid "Turnover Per Product"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_sale_list
+#: model:ir.ui.menu,name:sale.menu_report_order_sale_list
+msgid "Sales of the Month"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_product_tree
+#: model:ir.ui.menu,name:sale.menu_report_order_product
+msgid "Sales by Product (this month)"
+msgstr ""
+
+#. module: sale
+#: model:ir.report.custom,name:sale.ir_report_custom_4
+#: model:ir.report.custom,title:sale.ir_report_custom_4
+msgid "Monthly sales turnover over one year"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_category_tree_all
+#: model:ir.ui.menu,name:sale.menu_report_order_category_all
+#: view:report.sale.order.category:0
+msgid "Sales by Category of Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_product_tree_all
+#: model:ir.ui.menu,name:sale.menu_report_order_product_all
+#: view:report.sale.order.product:0
+msgid "Sales by Product"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_turnover_month_tree
+#: model:ir.model,name:sale.model_report_turnover_per_month
+#: view:report.turnover.per.month:0
+msgid "Turnover Per Month"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_category_tree
+#: model:ir.ui.menu,name:sale.menu_report_order_category
+msgid "Sales by Category of Product (this month)"
+msgstr ""
+
+#. module: sale
+#: model:ir.report.custom,name:sale.ir_report_custom_5
+#: model:ir.report.custom,title:sale.ir_report_custom_5
+msgid "Daily sales turnover over one year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,name:0
+#: field:report.sale.order.product,name:0
+#: field:report.turnover.per.month,name:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Klaida!"
+
+#~ msgid "Canceled"
+#~ msgstr "Atšaukta"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Klaida"
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sale order that is defined as 'Automatic "
+#~ "Invoice after delivery'."
+#~ msgstr ""
+#~ "Jūs negalite sukurti pardavimo užsakymui avanso, jeigu užsakymo tipas yra "
+#~ "'Automatinis s/f sukūrimas po pristatymo'."
+
+#, python-format
+#~ msgid "You must first cancel all packing attached to this sale order."
+#~ msgstr ""
+#~ "Jūs turite atšaukti visus važtaraščius susijusius su šiuo pardavimo užsakymu."
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sale order."
+#~ msgstr ""
+#~ "Pirmiausia Jūs turite atšaukti visas sąskaitas faktūras, susijusias su šiuo "
+#~ "pardavimo užsakymu."
+
+#, python-format
+#~ msgid "Invalid action !"
+#~ msgstr "Klaidingas veiksmas!"
+
+#, python-format
+#~ msgid "Could not cancel sale order !"
+#~ msgstr "Negalima atšaukti pardavimo užsakymo!"
+
+#, python-format
+#~ msgid "No Customer Defined !"
+#~ msgstr "Nenurodytas klientas!"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the packing order after the payment of this invoice.\n"
+#~ "  - The 'Shipping & Manual Invoice' will create the packing order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ "  - The 'Invoice on Order Ater Delivery' choice will generate the draft "
+#~ "invoice based on sale order after all packing lists have been finished.\n"
+#~ "  - The 'Invoice from the packing' choice is used to create an invoice "
+#~ "during the packing process."
+#~ msgstr ""
+#~ "Dokumentų generavimo metodas naudojamas sinchronizuoti s/f ir pristatymų "
+#~ "operacijas.\n"
+#~ "  - \"Apmokėjimas prieš pristatymą'' pirmiausia sugeneruoja s/f ir tik po "
+#~ "jos apmokėjimo sukuria važtaraštį.\n"
+#~ "  - \"Pristatymas ir rankinis s/f kūrimas'' automatiškai sugeneruoja "
+#~ "važtaraštį, o s/f sukuriama rankiniu būdu.\n"
+#~ "  - \"Automatinis s/f sukūrimas po pristatymo'' sukuriamas s/f juodraštis, "
+#~ "kai pristatomos visos prekės.\n"
+#~ "  - \"Rankinis s/f generavimas iš važtaraščio'' naudojama sukurti s/f "
+#~ "vykstant pristatymo procesui."
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Klaidingas modelis test_state"
+
+#, python-format
+#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
+#~ msgstr ""
+#~ "Jūs negalite atšaukti pardavimo užsakymo eilutės, kuriai jau yra išrašyta "
+#~ "sąskaita faktūra!"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Pristatymo laikotarpis"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the the shipping of the "
+#~ "products to the customer"
+#~ msgstr ""
+#~ "Dienų skaičius nuo užsakymo patvirtinimo iki produkto pristatymo klientui"
+
+#, python-format
+#~ msgid "Could not cancel this sale order !"
+#~ msgstr "Negalima atšaukti šio pardavimo užsakymo!"
+
+#, python-format
+#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
+#~ msgstr "Negalima ištrinti pardavimo užsakymo, kuri yra patvirtinta!"
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 9e51895277e..c5ade2b4f9f 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* sale
+#	* sale
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-24 20:45+0000\n"
+"PO-Revision-Date: 2010-07-18 10:05+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-06-22 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -71,7 +71,8 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Kroki dostawy zamówienia sprzedaży"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0
+#: rml:sale.order:0
 msgid "Quantity"
 msgstr "Ilość"
 
@@ -81,7 +82,8 @@ msgid "You invoice has been successfully created !"
 msgstr "Twoja faktura została poprawnie utworzona"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Deklaracja automatyczna"
 
@@ -156,10 +158,12 @@ msgstr "Przesunięcia zapasów"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Manual Designation"
-msgstr ""
+msgstr "Ręczne przypisanie"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
+#: view:sale.order:0
+#: field:sale.order,note:0
+#: view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Notatki"
@@ -170,7 +174,8 @@ msgid "Invoice after delivery"
 msgstr "Faktura po dostawie"
 
 #. module: sale
-#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Podatki"
 
@@ -185,7 +190,8 @@ msgid "Shipping Policy"
 msgstr "Zasady wysyłki"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 msgid "Cancelled"
 msgstr "Anulowano"
 
@@ -230,7 +236,8 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Nabycie jest tworzone po potwierdzeniu zamówienia sprzedaży"
 
 #. module: sale
-#: field:sale.order,project_id:0 field:sale.shop,project_id:0
+#: field:sale.order,project_id:0
+#: field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Konto analityczne"
 
@@ -320,7 +327,8 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Faktura wg zamówień sprzedaży"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Sklep sprzedaży"
 
@@ -335,7 +343,8 @@ msgid "Order N°"
 msgstr "Nr zamówienia"
 
 #. module: sale
-#: field:sale.order,order_line:0 view:sale.order.line:0
+#: field:sale.order,order_line:0
+#: view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Pozycje zamówienia"
 
@@ -345,7 +354,8 @@ msgid "Disc.(%)"
 msgstr "Up.(%)"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Pozycje faktury"
@@ -443,13 +453,15 @@ msgid "Order Reference"
 msgstr "Numer"
 
 #. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Wykonano"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Cennik"
 
@@ -620,7 +632,8 @@ msgid "Taxes :"
 msgstr "Podatki :"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Zafakturowano"
 
@@ -773,7 +786,8 @@ msgid "Direct Delivery"
 msgstr "Dostawa bezpośrednia"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Właściwości"
@@ -787,7 +801,7 @@ msgstr "Oferta"
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance Product"
-msgstr ""
+msgstr "Awansuj produkt"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
@@ -806,7 +820,8 @@ msgstr "Oblicz"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
+#: field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Sklep"
 
@@ -867,7 +882,8 @@ msgid "Delivery Order Only"
 msgstr "Tylko zamówienia dostawy"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Pozycje zamówienia sprzedaży"
 
@@ -882,14 +898,15 @@ msgid "Sales"
 msgstr "Sprzedaż"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Qty"
 msgstr "Il."
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Packing OUT is created for stockable products."
-msgstr ""
+msgstr "Wydanie zewnętrzne jest tworzone dla produktów rejestrowanych."
 
 #. module: sale
 #: view:sale.order:0
@@ -897,7 +914,8 @@ msgid "Other data"
 msgstr "Inne dane"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0
+#: rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Cena jednostkowa"
@@ -923,7 +941,8 @@ msgstr "Faktura"
 #: model:process.transition.action,name:sale.process_transition_action_cancel1
 #: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: wizard_button:sale.advance_payment_inv,init,end:0
-#: view:sale.config.picking_policy:0 view:sale.order.line:0
+#: view:sale.config.picking_policy:0
+#: view:sale.order.line:0
 #: wizard_button:sale.order.line.make_invoice,init,end:0
 #: wizard_button:sale.order.make_invoice,init,end:0
 msgid "Cancel"
@@ -945,14 +964,15 @@ msgstr ""
 "ale oczekuje na planistę, aby uruchomił akcję dla daty zamówienia."
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "UoM"
 msgstr "JM"
 
 #. module: sale
 #: field:sale.order.line,number_packages:0
 msgid "Number Packages"
-msgstr ""
+msgstr "Liczba opakowań"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -1060,7 +1080,8 @@ msgid "Ordering Contact"
 msgstr "Kontakt do zamawiającego"
 
 #. module: sale
-#: rml:sale.order:0 field:sale.order.line,name:0
+#: rml:sale.order:0
+#: field:sale.order.line,name:0
 msgid "Description"
 msgstr "Opis"
 
@@ -1117,7 +1138,8 @@ msgid ""
 msgstr "Nazwa i adres kontaktu proszącego o ofertę."
 
 #. module: sale
-#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Klient"
 
@@ -1129,7 +1151,8 @@ msgstr "Cennik zakupu"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Zamówienie sprzedaży"
@@ -1156,7 +1179,8 @@ msgid "Total amount"
 msgstr "Suma kwot"
 
 #. module: sale
-#: rml:sale.order:0 field:sale.order,date_order:0
+#: rml:sale.order:0
+#: field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Data zamówienia"
 
@@ -1166,9 +1190,9 @@ msgid "Product UoS"
 msgstr "JS produktu"
 
 #. module: sale
-#: selection:report.sale.order.created,state:0
+#: selection:sale.order,state:0
 msgid "Manual In Progress"
-msgstr "Recznie w trakcie przetwarzania"
+msgstr "Ręcznie w toku"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
@@ -1245,7 +1269,8 @@ msgstr ""
 "oddzielnie)"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "States"
 msgstr "Stany"
 
@@ -1265,7 +1290,8 @@ msgid "Error: Invalid ean code"
 msgstr "Błąd: Niedozwolony kod EAN"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0
+#: field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Wydano"
 
@@ -1442,7 +1468,7 @@ msgstr "Sprzedaż wg produktów"
 #. module: sale
 #: model:ir.ui.menu,name:sale.next_id_81
 msgid "This Month"
-msgstr "W tym miesiącu"
+msgstr "Bieżący miesiąc"
 
 #. module: sale
 #: field:report.sale.order.category,category_id:0
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index a4658bc3a1c..ed11f80e3a0 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -104,7 +104,7 @@
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended options..." groups="base.group_extended">
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
                     <field name="date"/>
                     <field name="date_confirm"/>
                     <separator orientation="vertical"/>
@@ -124,6 +124,7 @@
         <field name="search_view_id" ref="view_order_product_search"/>
         <field name="view_id" ref="view_order_product_tree"/>
         <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="help">With Sales Analysis consult your sales total amount suits to different group criteria (salesman, partner, product, etc.)</field>
     </record>
 
     <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11"/>
@@ -135,6 +136,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="context">{'search_default_month':1, 'search_default_group_product':1, 'search_default_group_partner':1, 'search_default_done':1, 'search_default_out': 1, 'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="help">Shipments Analysis opens a search views with all your shipments (in and out quantities), their total value, planned and actual dates. You can sort out your analysis on different groups to get fine grained analysis.</field>
     </record>
     <menuitem action="action_stock_move_report_so" id="menu_action_stock_move_report_so" parent="base.next_id_64" sequence="25"/>
 
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 172fe1226ef..9b0f555fc80 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -221,7 +221,7 @@ class sale_order(osv.osv):
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
             ('cancel', 'Cancelled')
-            ], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
+            ], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
         'date_order': fields.date('Ordered Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'create_date': fields.date('Creation Date', readonly=True, help="Date on which sale order is created"),
         'date_confirm': fields.date('Confirmation Date', readonly=True, help="Date on which sale order is confirmed"),
@@ -473,7 +473,9 @@ class sale_order(osv.osv):
         for o in self.browse(cr, uid, ids):
             lines = []
             for line in o.order_line:
-                if (line.state in states) and not line.invoiced:
+                if line.invoiced:
+                    raise osv.except_osv(_('Error !'), _('The Sale Order already has some lines invoiced. You should continue the billing process by line.'))
+                elif (line.state in states):
                     lines.append(line.id)
             created_lines = self.pool.get('sale.order.line').invoice_line_create(cr, uid, lines)
             if created_lines:
@@ -559,13 +561,12 @@ class sale_order(osv.osv):
                     wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
             sale_order_line_obj.write(cr, uid, [l.id for l in  sale.order_line],
                     {'state': 'cancel'})
+            message = _('Sale order') + " '" + sale.name + _(" is cancelled")
+            self.log(cr, uid, sale.id, message)
         self.write(cr, uid, ids, {'state': 'cancel'})
-        message = _('Sale order') + " '" + sale.name + "' "+ _("created on")+" '" +sale.create_date + _(" is cancelled")
-        self.log(cr, uid, id, message)
         return True
 
     def action_wait(self, cr, uid, ids, *args):
-        product=[]
         product_obj = self.pool.get('product.product')
         for o in self.browse(cr, uid, ids):
             if (o.order_policy == 'manual'):
@@ -573,11 +574,8 @@ class sale_order(osv.osv):
             else:
                 self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
             self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
-            for line in o.order_line:
-                product.append(line.product_id.default_code)
-        params = ', '.join(map(lambda x : str(x),product))
-        message = _('Sale order ') + " '" + o.name + "' "+ _("created on")+" '" +o.create_date + "' "+_("for")+" '" +params  + "' "+_("is confirmed")
-        self.log(cr, uid, id, message)
+            message = _('Quotation') + " '" + o.name + "' "+ _("is converted to Sale order")
+            self.log(cr, uid, o.id, message)
         return True
 
     def procurement_lines_get(self, cr, uid, ids, *args):
@@ -657,7 +655,6 @@ class sale_order(osv.osv):
                             'invoice_state': (order.order_policy=='picking' and '2binvoiced') or 'none',
                             'company_id': order.company_id.id,
                         })
-
                     move_id = self.pool.get('stock.move').create(cr, uid, {
                         'name': line.name[:64],
                         'picking_id': picking_id,
@@ -719,7 +716,6 @@ class sale_order(osv.osv):
                             val['state'] = 'manual'
                             break
             self.write(cr, uid, [order.id], val)
-
         return True
 
     def action_ship_end(self, cr, uid, ids, context=None):
@@ -830,11 +826,11 @@ class sale_order_line(osv.osv):
         'notes': fields.text('Notes'),
         'th_weight': fields.float('Weight', readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True,
-                help=' * The \'Draft\' state is set automatically when sale order in draft state. \
-                    \n* The \'Confirmed\' state is set automatically when sale order in confirm state. \
-                    \n* The \'Exception\' state is set automatically when sale order is set as exception. \
-                    \n* The \'Done\' state is set automatically when sale order is set as done. \
-                    \n* The \'Cancelled\' state is set automatically when user cancel sale order.'),
+                help='* The \'Draft\' state is set when the related sale order in draft state. \
+                    \n* The \'Confirmed\' state is set when the related sale order is confirmed. \
+                    \n* The \'Exception\' state is set when the related sale order is set as exception. \
+                    \n* The \'Done\' state is set when the sale order line has been picked. \
+                    \n* The \'Cancelled\' state is set when a user cancel the sale order related.'),
         'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
         'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'),
         'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -939,10 +935,11 @@ class sale_order_line(osv.osv):
         for line in self.browse(cr, uid, ids, context=context):
             if line.invoiced:
                 raise osv.except_osv(_('Invalid action !'), _('You cannot cancel a sale order line that has already been invoiced !'))
-#            if line.order_id.picking_ids:
-#                raise osv.except_osv(
-#                        _('Could not cancel sale order line!'),
-#                        _('You must first cancel stock move attached to this sale order line.'))
+            for pick in line.order_id.picking_ids:
+                if pick.state != 'cancel':
+                    raise osv.except_osv(
+                            _('Could not cancel sale order line!'),
+                            _('You must first cancel all pickings attached with sale order.'))
         message = _('Sale order line') + " '" + line.name + "' "+_("is cancelled")
         self.log(cr, uid, id, message)
         return self.write(cr, uid, ids, {'state': 'cancel'})
@@ -950,9 +947,6 @@ class sale_order_line(osv.osv):
     def button_confirm(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        for (id,name) in self.name_get(cr, uid, ids):
-            message = _('Sale order line') + " '" + name + "' "+ _("is confirmed")
-            self.log(cr, uid, id, message)
         return self.write(cr, uid, ids, {'state': 'confirmed'})
 
     def button_done(self, cr, uid, ids, context=None):
@@ -962,8 +956,6 @@ class sale_order_line(osv.osv):
         res = self.write(cr, uid, ids, {'state': 'done'})
         for line in self.browse(cr, uid, ids, context=context):
             wf_service.trg_write(uid, 'sale.order', line.order_id.id, cr)
-        message = _('Sale order line') + " '" + line.name + "' "+_("is done")
-        self.log(cr, uid, id, message)
         return res
 
     def uos_change(self, cr, uid, ids, product_uos, product_uos_qty=0, product_id=None):
diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py
new file mode 100644
index 00000000000..d85273fa9a0
--- /dev/null
+++ b/addons/sale/sale_installer.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 fields, osv
+
+class sale_installer(osv.osv_memory):
+    _name = 'sale.installer'
+    _inherit = 'res.config.installer'
+
+    _columns = {
+        'sale_analytic_plans': fields.boolean('Sales Analytic Distribution Management',
+            help="The base module to manage analytic distribution and sales orders."),
+        'sale_journal': fields.boolean('Sales and deliveries by journal',
+            help="The sale journal modules allows you to categorise your "
+                "sales and deliveries (picking lists) between different journals. "
+                "This module is very helpful for bigger companies that "
+                "works by departments."),
+        'sale_layout': fields.boolean('Sale Order Layout Improvement',
+            help="This module provides some features to improve the layout of the Sale Order."),
+        'sale_margin': fields.boolean('Margins in Sale Orders',
+            help="This module adds the 'Margin' on sales order, "
+                "which gives the profitability by calculating "
+                "the difference between the Unit Price and Cost Price."),
+        'sale_order_dates': fields.boolean('Sale Order Dates',
+            help="Add commitment, requested and effective dates on the sale order."),
+        }
+sale_installer()
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
new file mode 100644
index 00000000000..c77faf905e6
--- /dev/null
+++ b/addons/sale/sale_installer.xml
@@ -0,0 +1,66 @@
+<openerp>
+  <data>
+    <record id="view_sale_installer" model="ir.ui.view">
+      <field name="name">sale.installer.view</field>
+      <field name="model">sale.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes">
+            <attribute name="string">Sale Management Modules Installation</attribute>
+          </form>
+
+          <separator string="title" position="attributes">
+            <attribute name="string">Sales Management</attribute>
+          </separator>
+          <xpath expr="//label[@string='description']"
+                 position="attributes">
+            <attribute name="string">After having installed the core sales application, you can extend it depending on the needs of your sale's organization.</attribute>
+          </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                <attribute name='string'></attribute>
+          </xpath>
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
+                   <attribute name="string">Configure</attribute>
+          </xpath>
+          <group colspan="8">
+            <field name="sale_analytic_plans"/>
+            <field name="sale_journal"/>
+            <field name="sale_layout"/>
+            <field name="sale_margin"/>
+            <field name="sale_order_dates"/>
+          </group>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_sale_installer" model="ir.actions.act_window">
+      <field name="name">Sale Management Modules Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">sale.installer</field>
+      <field name="view_id" ref="view_sale_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="sale_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_sale_installer"/>
+      <field name="sequence">3</field>
+      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
+    </record>
+
+   <record id="sale_ir_actions_todo_tree" model="ir.ui.view">
+    <field name="model">ir.actions.todo</field>
+    <field name="name">sale_installer_action_replace</field>
+    <field name="type">tree</field>
+    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+    <field name="arch" type="xml">
+     <xpath expr="//button[@string='Launch']" position="replace">
+            <button name="%(action_sale_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+        </xpath>
+    </field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 54474a81633..69b9b1c094a 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -79,11 +79,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sales orders">
-                    <field name="date_order"/>
                     <field name="name"/>
                     <field name="partner_id"/>
-                    <field name="partner_shipping_id"/>
                     <field name="user_id" />
+                    <field name="date_order"/>
+                    <field name="partner_shipping_id"/>
                     <field name="picked_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
                     <field name="amount_untaxed" sum="Total Untaxed amount"/>
@@ -93,15 +93,6 @@
             </field>
         </record>
 
-        <act_window name="Partial Invoice"
-           res_model="sale.advance.payment.inv"
-           src_model="sale.order"
-           view_mode="form"
-           target="new"
-           key2="client_action_multi"
-           id="action_view_sale_advance_payment_inv"/>
-
-
         <record id="view_order_form" model="ir.ui.view">
             <field name="name">sale.order.form</field>
             <field name="model">sale.order</field>
@@ -164,12 +155,14 @@
                                                 <separator colspan="5" string="States"/>
                                                 <field name="state"/>
                                                 <field name="invoiced"/>
+                                                <group attrs="{'invisible':[('invoiced','=',True)]}">
                                                 <button colspan="1"
                                                     name="create_sale_order_line_invoice"
                                                     states="confirmed"
                                                     string="Create Invoice"
                                                     type="object"
                                                     icon="terp-document-new" />
+                                                 </group>
                                             </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
@@ -204,7 +197,7 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                                <button name="%(action_view_sale_advance_payment_inv)d" string="Deposit" type="action" icon="gtk-execute"/>
+                                <button name="%(action_view_sale_advance_payment_inv)d" string="Deposit" type="action" icon="gtk-execute" attrs="{'invisible':[('state','!=','draft')]}"/>
                             </group>
                             <group col="13" colspan="4">
                                 <field name="state"/>
@@ -264,22 +257,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]" help="Sale Orders that haven't yet be confirmed"/>
                     <filter icon="terp-check" string="Sales" domain="[('state','in',('manual','progress'))]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('state','=','manual')]"/>
+                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sale Orders ready to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
-                    <field name="user_id" select="1"/>
+                    <field name="user_id" select="1">
+                          <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
+                    </field>
+
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
                </search>
             </field>
@@ -292,6 +289,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
+            <field name="help">The sale order manages the invoicing, the product fullfilment and the delivery processes. OpenERP can handle products, services and consumables so that a sale order can trigger tasks, manufacturing orders, purchases, etc. It support several invoicing methods according to your configuration: from the sale order, from the pickings, etc.</field>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>
 
@@ -397,23 +395,20 @@
                             <separator colspan="4" string="States"/>
                             <field name="state"/>
                             <group col="3" colspan="2">
-                            	<button colspan="1"
-	                              name="create_sale_order_line_invoice"
-	                              states="confirmed"
-	                              string="Create Invoice"
-	                              type="object"
-	                              icon="terp-document-new"
-	                              attrs="{'invisible': [('invoiced', '=', 1)]}"/>
-	                            <button name="button_cancel"
-                                    states="confirmed,exception"
+                                <button colspan="1"
+                                  name="create_sale_order_line_invoice"
+                                  string="Create Invoice"
+                                  type="object"
+                                  icon="terp-document-new"
+                                  attrs="{'invisible': ['|',('state', 'in', ('draft','cancel')),('invoiced', '=', 1)]}"/>
+                                <button name="button_cancel"
                                     string="Cancel" type="object"
                                     icon="gtk-cancel"
-                                    attrs="{'invisible': [('invoiced', '=', 1)]}" />
+                                    attrs="{'invisible': ['|',('state', 'not in', ('confirmed', 'exception')),('invoiced', '=', 1)]}"/>
                                 <button name="button_done"
-                                    states="confirmed,exception"
                                     string="Done" type="object"
-									icon="gtk-jump-to"
-									attrs="{'invisible': [('invoiced', '=', 0)]}"/>
+                                    icon="gtk-jump-to"
+                                    attrs="{'invisible': ['|',('state', 'not in', ('confirmed','exception')),('invoiced', '=', 0)]}"/>
                             </group>
                         </page>
 <!--                        <page string="Properties" groups="base.group_extended">-->
@@ -436,13 +431,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1" help="Sale Order Lines ready to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id">
-                        <filter icon="terp-dolar" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                        <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sale Order Lines related to a Sale Order of mine"/>
                     </field>
                     <newline/>
                     <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
@@ -464,20 +459,23 @@
                     <filter icon="terp-accessories-archiver" string="Shipped"
                         domain="[('state','=','done')]"
                         name="unshipped"
+                        help="Sale Order Lines that are in 'done' state"
                         />
                     <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced"
                         domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
+                        help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"
                         />
-                    <filter icon="terp-dolar" string="Sale Order"
+                    <filter icon="terp-check" string="Confirmed"
                         domain="[('state','=','confirmed')]"
                         name="sale order"
+                        help="Confirmed Sale Order Lines"
                         />
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id">
-                        <filter icon="terp-dolar" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                        <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
                     </field>
                     <newline />
                     <group expand="0" string="Group By..." colspan="9" col="8">
@@ -498,6 +496,7 @@
             <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
             <field name="context">{"search_default_uninvoiced":1}</field>
             <field name="filter" eval="True"/>
+            <field name="help">Lines to invoice opens a search view with sales order and their status.</field>
         </record>
 
         <record id="action_order_line_tree3" model="ir.actions.act_window">
diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml
index 8b93b031d39..5a8d06c354c 100644
--- a/addons/sale/test/advance_invoice.yml
+++ b/addons/sale/test/advance_invoice.yml
@@ -1,269 +1,23 @@
 -
-  In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
--
-  I am going to sell my Mobile products to the customer with name Cleartrail
+  In order to test the Deposit wizard of sale module in the Open-ERP,
+  I create a Sale Order for LG Viewty Smart for qty 100 having order_policy manual.
 - 
-  I create View Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_view0}:
-    close_method: none
-    code: View
-    name: View
-    sign: 1
-- 
-  I create Income Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_income0}:
-    close_method: unreconciled
-    code: Income
-    name: Income
-    sign: 1
-- 
-  I create Expense Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_expense0}:
-    close_method: unreconciled
-    code: Expense
-    name: Expense
-    sign: 1
-- 
-  I create Cash Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_cash0}:
-    close_method: balance
-    code: Cash
-    name: Cash
-    sign: 1
-- 
-  I create Minimal Chart Account.
-- 
-  !record {model: account.account, id: account_account_minimalchart0}:
-    code: '0'
-    company_id: base.main_company
-    currency_mode: current
-    name: Minimal Chart
-    parent_left: 1
-    parent_right: 12
-    type: view
-    user_type: account_account_type_view0
-- 
-  I create Payable Account.
-- 
-  !record {model: account.account, id: account_account_payable1}:
-    code: AP
-    company_id: base.main_company
-    currency_mode: current
-    name: Payable
-    parent_id: account_account_minimalchart0
-    parent_left: 2
-    parent_right: 3
-    reconcile: true
-    type: payable
-    user_type: account_account_type_expense0
-- 
-  I create Receivable Account.
-- 
-  !record {model: account.account, id: account_account_receivable0}:
-    code: AR
-    currency_mode: current
-    name: Receivable
-    parent_id: account_account_minimalchart0
-    parent_left: 4
-    parent_right: 5
-    reconcile: true
-    type: receivable
-    user_type: account_account_type_income0
-- 
-  I create Cash Account.
-- 
-  !record {model: account.account, id: account_account_cash0}:
-    code: C
-    currency_mode: current
-    name: Cash
-    parent_id: account_account_minimalchart0
-    parent_left: 6
-    parent_right: 7
-    type: other
-    user_type: account_account_type_cash0
-- 
-  I create Purchases Account.
-- 
-  !record {model: account.account, id: account_account_purchases0}:
-    code: P
-    company_id: base.main_company
-    currency_mode: current
-    name: Purchases
-    parent_id: account_account_minimalchart0
-    parent_left: 8
-    parent_right: 9
-    type: other
-    user_type: account_account_type_expense0
-- 
-  I create Sales Account.
-- 
-  !record {model: account.account, id: account_account_sales0}:
-    code: S
-    company_id: base.main_company
-    currency_mode: current
-    name: Sales
-    parent_id: account_account_minimalchart0
-    parent_left: 10
-    parent_right: 11
-    type: other
-    user_type: account_account_type_income0
-- 
-  I create Purchase Journal.
-- 
-  !record {model: account.journal, id: account_journal_purchasejournal0}:
-    code: PUJ
-    company_id: base.main_company
-    default_credit_account_id: account_account_purchases0
-    default_debit_account_id: account_account_purchases0
-    name: Purchase Journal
-    sequence_id: account.sequence_purchase_journal
-    type: purchase
-    view_id: account.account_journal_view
-- 
-  I create Sale Journal.
-- 
-  !record {model: account.journal, id: account_journal_salejournal0}:
-    code: SAJ
-    company_id: base.main_company
-    default_credit_account_id: account_account_sales0
-    default_debit_account_id: account_account_sales0
-    name: Sale Journal
-    sequence_id: account.sequence_sale_journal
-    type: sale
-    view_id: account.account_journal_view
-- 
-  I create Bank Journal.
-- 
-  !record {model: account.journal, id: account_journal_bankjournal0}:
-    code: BNK
-    default_credit_account_id: account_account_cash0
-    default_debit_account_id: account_account_cash0
-    name: Bank Journal
-    sequence_id: account.sequence_journal
-    type: cash
-    view_id: account.account_journal_bank_view
-- 
-  I create ir.property for account payable.
-- 
-  !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
-    company_id: base.main_company
-    fields_id: account.field_res_partner_property_account_payable
-    name: property_account_expense_categ
-    value_reference: account.account,5
-- 
-  I create ir.property for account receivable.
-- 
-  !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
-    company_id: base.main_company
-    fields_id: account.field_res_partner_property_account_receivable
-    name: property_account_income_categ
-    value_reference: account.account,6
-- 
-  I create Partner category Customers.
-- 
-  !record {model: res.partner.category, id: res_partner_category_customers0}:
-    name: Customers
--
-  I create Cleartrail Customer.
-- 
-  !record {model: res.partner, id: res_partner_cleartrail0}:
-    category_id:
-      - res_partner_category_customers0
-    name: Cleartrail
-- 
-  I create contact address for Cleartrail.
-- 
-  !record {model: res.partner.address, id: res_partner_address_1}:
-    partner_id: res_partner_cleartrail0
-    street: onam plaza, 14 B palasia A B Road
-    type: contact
-- 
-  I create invoice address for Cleartrail.
-- 
-  !record {model: res.partner.address, id: res_partner_address_2}:
-    partner_id: res_partner_cleartrail0
-    street: sarda house 24 B palasia, A B Road
-    type: invoice
-- 
-  I create delivery address for Cleartrail.
-- 
-  !record {model: res.partner.address, id: res_partner_address_3}:
-    partner_id: res_partner_cleartrail0
-    street: sangam house 15 B palasia, A B Road
-    type: delivery
--
-  Customer Cleartrail has specific instrument requirement regarding the stockable products.
-- 
-  I define product category Mobile Products Sellable.
-- 
-  !record {model: product.category, id: product_category_allproductssellable0}:
-    name: Mobile Products Sellable
-    
-    
-- 
-  I define product category Mobile Services. 
-- 
-  !record {model: product.category, id: product_category_services0}:
-    name: Mobile Services
-- 
-  I define LG Viewty Smart product template.
-- 
-  !record {model: product.template, id: product_template_lgviewtysmart0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 170.0
-    mes_type: fixed
-    name: LG Viewty Smart
-    procure_method: make_to_order
-    standard_price: 160.0
-    supply_method: produce
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    
--    
-  I define LG Viewty Smart product.
-- 
-  !record {model: product.product, id: product_product_lgviewtysmart0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 170.0
-    mes_type: fixed
-    name: LG Viewty Smart
-    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 160.00\n'
-    pricelist_sale: 'Public Pricelist (0.00) : 170.00\n'
-    procure_method: make_to_order
-    property_account_expense: sale.account_account_payable1
-    property_account_income: sale.account_account_receivable0
-    seller_delay: '1'
-    standard_price: 160.0
-    supply_method: produce
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
-  I create a Sale Order for LG Viewty Smart for qty 500 having order_policy prepaid.
-- 
-  !record {model: sale.order, id: sale_order_so0}:
-    date_order: '2010-05-03'
+  !record {model: sale.order, id: sale_order_so5}:
+    date_order: '2010-07-17'
     invoice_quantity: order
     name: SO004
     order_line:
       - name: LG Viewty Smart
         price_unit: 170.0
         product_uom: product.product_uom_unit
-        product_uom_qty: 500.0
+        product_uom_qty: 100.0
         state: draft
         delay: 7.0
         product_id: sale.product_product_lgviewtysmart0
-        product_uos_qty: 500.0
+        product_uos_qty: 100.0
         th_weight: 0.0
         type: make_to_order
-    order_policy: prepaid
+    order_policy: manual
     partner_id: sale.res_partner_cleartrail0
     partner_invoice_id: sale.res_partner_address_2
     partner_order_id: sale.res_partner_address_1
@@ -271,28 +25,164 @@
     picking_policy: direct
     pricelist_id: product.list0
     shop_id: sale.shop
-    
+-
+  I confirm the Sale Order.
 - 
-  I use the Advance Payment wizard.
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so5}
+-
+   I use the Advance Payment wizard.
 - 
   !record {model: sale.advance.payment.inv, id: sale_advance_payment_inv_0}:
     amount: 1000.0
     product_id: product.product_product_pc3
     qtty: 3.0
-    
-    
 - 
-  Performing an osv_memory action create_invoices on module sale.advance.payment.inv
+  Then I click on the "Create Partial Invoice" button
 - 
   !python {model: sale.advance.payment.inv}: |
     self.create_invoices(cr, uid, [ref("sale_advance_payment_inv_0")], {"lang": 'en_US',
-      "active_model": 'sale.order', "active_ids": [ref("sale_order_so0")], "tz":
-      False, "active_id": ref("sale_order_so0"), })
+      "active_model": 'sale.order', "active_ids": [ref("sale_order_so5")], "tz":
+      False, "active_id": ref("sale_order_so5"), })
 -
-  I will verify whether the invoice has been generated.
+  I verify whether the invoice has been generated.
 -
   !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"    
-    
-    
+    so = self.browse(cr, uid, ref("sale_order_so5"))
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so5"    
+-    
+  I open the Invoice for the SO.
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+-
+  I verify that an invoice state has transit from draft to open state
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
+    invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')])
+    assert invoice_id, "Invoice is not in the open state"
+-
+  Creating a account invoice pay entry.
+- 
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
+    amount: 3000.0
+    date: '2010-07-17'
+    journal_id: sale.account_journal_bankjournal0
+    name: test
+    period_id: account.period_5
+- 
+  I pay the invoice.
+-
+  !python {model: account.invoice.pay}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
+    self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "active_model": "account.invoice", 
+      "tz":False,"record_id": so.invoice_ids[0].id, "active_ids": [so.invoice_ids[0].id], "type":
+      "out_invoice", "active_id": so.invoice_ids[0].id})
+-
+  Creating an account invoice pay writeoff entry.
+- 
+  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_5}:
+    analytic_id: account.analytic_customers
+    comment: Write-Off
+    writeoff_acc_id: account.a_sale
+    writeoff_journal_id: sale.account_journal_bankjournal0
+-
+  I verify that invoice has transit from Open to Done state
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
+    invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')])
+    assert invoice_id, "Invoice for SO is not in done state."
+-
+  I verify that Paid has been set to true.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so5"))
+    assert(sale_id.invoiced == True), "Paid has not been set to true"
+-
+  I click on "Create Invoice" button of Sales order to create the invoice.
+- 
+  !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so5}
+-
+  I verify whether the invoice has been generated for SO
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so5"))
+    assert so.invoice_ids[1], "Invoices has not been generated for sale_order_so5" 
+-
+  I open the Invoice for the SO.
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+-
+  I verify that an invoice state has transit from draft to open state
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
+    invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')])
+    assert invoice_id, "Invoice is not in the open state"
+-
+  Creating a account invoice pay entry.
+- 
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst2}:
+    amount: 14000.0
+    date: '2010-07-17'
+    journal_id: sale.account_journal_bankjournal0
+    name: test
+    period_id: account.period_5
+- 
+  I pay the invoice.
+-
+  !python {model: account.invoice.pay}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
+    self.wo_check(cr, uid, [ref("account_invoice_pay_tst2")], {"lang": "en_US", "active_model": "account.invoice", 
+      "tz":False,"record_id": so.invoice_ids[1].id, "active_ids": [so.invoice_ids[1].id], "type":
+      "out_invoice", "active_id": so.invoice_ids[1].id})
+-
+  Creating an account invoice pay writeoff entry.
+- 
+  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
+    analytic_id: account.analytic_customers
+    comment: Write-Off
+    writeoff_acc_id: account.a_sale
+    writeoff_journal_id: sale.account_journal_bankjournal0
+- 
+  Pay and Reconcile the Invoice.
+- 
+  !python {model: account.invoice.pay.writeoff}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))   
+    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
+      {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+      [so.invoice_ids[1].id], "type": "out_invoice", "active_id": so.invoice_ids[1].id})
+-
+  I verify that an invoice is in done state.
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
+    invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')])
+    assert invoice_id, "Invoice for SO is not in done state."
+-
+  I verify that Paid has been set to true.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so5"))
+    assert(sale_id.invoiced == True), "Paid has not been set to true"
\ No newline at end of file
diff --git a/addons/sale/test/prepaid_sale_order.yml b/addons/sale/test/data_test.yml
similarity index 58%
rename from addons/sale/test/prepaid_sale_order.yml
rename to addons/sale/test/data_test.yml
index ce344bb23ae..ef3b0bfe0ed 100644
--- a/addons/sale/test/prepaid_sale_order.yml
+++ b/addons/sale/test/data_test.yml
@@ -1,42 +1,42 @@
 -
-  In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
+  In order to test the sale module, I need to configure details regarding product,customer and account.
 -
   I am going to sell my Mobile products to the customer with name Cleartrail
--
+- 
   I create View Account Type.
--
+- 
   !record {model: account.account.type, id: account_account_type_view0}:
     close_method: none
     code: View
     name: View
     sign: 1
--
+- 
   I create Income Account Type.
--
+- 
   !record {model: account.account.type, id: account_account_type_income0}:
     close_method: unreconciled
     code: Income
     name: Income
     sign: 1
--
+- 
   I create Expense Account Type.
--
+- 
   !record {model: account.account.type, id: account_account_type_expense0}:
     close_method: unreconciled
     code: Expense
     name: Expense
     sign: 1
--
+- 
   I create Cash Account Type.
--
+- 
   !record {model: account.account.type, id: account_account_type_cash0}:
     close_method: balance
     code: Cash
     name: Cash
     sign: 1
--
+- 
   I create Minimal Chart Account.
--
+- 
   !record {model: account.account, id: account_account_minimalchart0}:
     code: '0'
     company_id: base.main_company
@@ -46,9 +46,9 @@
     parent_right: 12
     type: view
     user_type: account_account_type_view0
--
+- 
   I create Payable Account.
--
+- 
   !record {model: account.account, id: account_account_payable1}:
     code: AP
     company_id: base.main_company
@@ -60,11 +60,12 @@
     reconcile: true
     type: payable
     user_type: account_account_type_expense0
--
+- 
   I create Receivable Account.
--
+- 
   !record {model: account.account, id: account_account_receivable0}:
     code: AR
+    company_id: base.main_company
     currency_mode: current
     name: Receivable
     parent_id: account_account_minimalchart0
@@ -73,11 +74,12 @@
     reconcile: true
     type: receivable
     user_type: account_account_type_income0
--
+- 
   I create Cash Account.
--
+- 
   !record {model: account.account, id: account_account_cash0}:
     code: C
+    company_id: base.main_company
     currency_mode: current
     name: Cash
     parent_id: account_account_minimalchart0
@@ -85,9 +87,9 @@
     parent_right: 7
     type: other
     user_type: account_account_type_cash0
--
+- 
   I create Purchases Account.
--
+- 
   !record {model: account.account, id: account_account_purchases0}:
     code: P
     company_id: base.main_company
@@ -98,9 +100,9 @@
     parent_right: 9
     type: other
     user_type: account_account_type_expense0
--
+- 
   I create Sales Account.
--
+- 
   !record {model: account.account, id: account_account_sales0}:
     code: S
     company_id: base.main_company
@@ -111,9 +113,9 @@
     parent_right: 11
     type: other
     user_type: account_account_type_income0
--
+- 
   I create Purchase Journal.
--
+- 
   !record {model: account.journal, id: account_journal_purchasejournal0}:
     code: PUJ
     company_id: base.main_company
@@ -123,9 +125,9 @@
     sequence_id: account.sequence_purchase_journal
     type: purchase
     view_id: account.account_journal_view
--
+- 
   I create Sale Journal.
--
+- 
   !record {model: account.journal, id: account_journal_salejournal0}:
     code: SAJ
     company_id: base.main_company
@@ -135,81 +137,80 @@
     sequence_id: account.sequence_sale_journal
     type: sale
     view_id: account.account_journal_view
--
+- 
   I create Bank Journal.
--
+- 
   !record {model: account.journal, id: account_journal_bankjournal0}:
     code: BNK
+    company_id: base.main_company
     default_credit_account_id: account_account_cash0
     default_debit_account_id: account_account_cash0
     name: Bank Journal
     sequence_id: account.sequence_journal
     type: cash
     view_id: account.account_journal_bank_view
--
+- 
   I create ir.property for account payable.
--
+- 
   !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
     company_id: base.main_company
     fields_id: account.field_res_partner_property_account_payable
     name: property_account_expense_categ
     value_reference: account.account,5
--
+- 
   I create ir.property for account receivable.
--
+- 
   !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
     company_id: base.main_company
     fields_id: account.field_res_partner_property_account_receivable
     name: property_account_income_categ
     value_reference: account.account,6
--
+- 
   I create Partner category Customers.
--
+- 
   !record {model: res.partner.category, id: res_partner_category_customers0}:
     name: Customers
 -
   I create Cleartrail Customer.
--
+- 
   !record {model: res.partner, id: res_partner_cleartrail0}:
     category_id:
       - res_partner_category_customers0
     name: Cleartrail
--
+- 
   I create contact address for Cleartrail.
--
+- 
   !record {model: res.partner.address, id: res_partner_address_1}:
     partner_id: res_partner_cleartrail0
     street: onam plaza, 14 B palasia A B Road
     type: contact
--
+- 
   I create invoice address for Cleartrail.
--
+- 
   !record {model: res.partner.address, id: res_partner_address_2}:
     partner_id: res_partner_cleartrail0
     street: sarda house 24 B palasia, A B Road
     type: invoice
--
+- 
   I create delivery address for Cleartrail.
--
+- 
   !record {model: res.partner.address, id: res_partner_address_3}:
     partner_id: res_partner_cleartrail0
     street: sangam house 15 B palasia, A B Road
     type: delivery
 -
   Customer Cleartrail has specific instrument requirement regarding the stockable products.
--
+- 
   I define product category Mobile Products Sellable.
--
+- 
   !record {model: product.category, id: product_category_allproductssellable0}:
     name: Mobile Products Sellable
-
-
--
-  I define product category Mobile Services.
 -
+  I define product category Mobile Services. 
+- 
   !record {model: product.category, id: product_category_services0}:
     name: Mobile Services
--
+- 
   I define LG Viewty Smart product template.
 -
   !record {model: product.template, id: product_template_lgviewtysmart0}:
@@ -239,138 +240,53 @@
     property_account_expense: sale.account_account_payable1
     property_account_income: sale.account_account_receivable0
     seller_delay: '1'
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_agrolait
+        min_qty: 2.0
+        qty: 5.0
     standard_price: 160.0
     supply_method: produce
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
 -
-  I create a Sale Order for LG Viewty Smart for qty 500 having order_policy prepaid.
--
-  !record {model: sale.order, id: sale_order_so1}:
-    date_order: '2010-05-03'
-    invoice_quantity: order
-    name: Test_SO001
-    order_line:
-      - name: LG Viewty Smart
-        price_unit: 170.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 500.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_lgviewtysmart0
-        product_uos_qty: 500.0
-        th_weight: 0.0
-        type: make_to_order
-    order_policy: prepaid
-    partner_id: sale.res_partner_cleartrail0
-    partner_invoice_id: sale.res_partner_address_2
-    partner_order_id: sale.res_partner_address_1
-    partner_shipping_id: sale.res_partner_address_3
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
-
-
--
-  I confirm the sale order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so1}
--
-  I will verify whether the invoice has been generated for SO since Shipping policy is 'Payment Before Delivery'
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so1"))
-    assert so.invoice_ids, "Invoices has not been generated for sale_order_so1"
--
-  I open the Invoice for the SO.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
--
-  Creating a account invoice pay entry.
--
-  !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
-    amount: 85000.0
-    date: '2010-05-10'
-    journal_id: sale.account_journal_bankjournal0
-    name: tst
-    period_id: account.period_5
--
-  I pay the invoice.
--
-  !python {model: account.invoice.pay}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-    self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
-      False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
-      "out_invoice", "active_id": so.invoice_ids[0].id, })
-
-
--
-  Creating an account invoice pay writeoff entry.
--
-  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
-    analytic_id: account.analytic_customers
-    comment: Write-Off
-    writeoff_acc_id: account.a_sale
-    writeoff_journal_id: sale.account_journal_bankjournal0
-
-
--
-  Pay and Reconcile the Invoice.
--
-  !python {model: account.invoice.pay.writeoff}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
-      {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
-      [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id })
-
-
--
-  I will verify the picking associated with the sale order sale_order_so1
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so1"))
-    assert so.picking_ids,"Picking has not been generated for sale_order_so1"
--
-  Products are delivered to the Cleartrail Customer.
--
-  !python {model: stock.picking }: |
-   import time
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      pick.force_assign(cr, uid)
-      partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-            'address_id': pick.address_id.id,
-            'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-      move = pick.move_lines[0]
-      partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id.id,
-          'product_qty': move.product_qty,
-          'product_uom': move.product_uom.id,
-      }
-      self.do_partial(cr, uid, [pick.id],partial_datas)
--
-  I verify that picking order is in done state.
--
-  !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-
-   if picking_id:
-     pick = self.browse(cr,uid,picking_id[0])
-     assert (pick.state) =='done', "Picking for SO is not in done state."
+  I define Slider Mobile template.
+- 
+  !record {model: product.template, id: product_template_slidermobile0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 200.0
+    mes_type: fixed
+    name: Slider Mobile
+    procure_method: make_to_order
+    standard_price: 189.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+- 
+  I define Slider Mobile.
+- 
+  !record {model: product.product, id: product_product_slidermobile0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 200
+    mes_type: fixed
+    name: Slider Mobile
+    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 500.0.00\n'
+    pricelist_sale: 'Public Pricelist (0.00) : 510.00\n'
+    procure_method: make_to_order
+    property_account_expense: sale.account_account_payable1
+    property_account_income: sale.account_account_receivable0
+    seller_delay: '1'
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_agrolait
+        min_qty: 2.0
+        qty: 5.0
+    standard_price: 189.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
diff --git a/addons/sale/test/invoice_on_ordered_qty.yml b/addons/sale/test/invoice_on_ordered_qty.yml
new file mode 100644
index 00000000000..9056e4cbb83
--- /dev/null
+++ b/addons/sale/test/invoice_on_ordered_qty.yml
@@ -0,0 +1,151 @@
+-
+  In order to test the Sale module in OpenERP,
+  I create a Sale Order for Slider Mobile for 500 quantity having Shipping Policy 'Shipping & Manual Invoice' and Invoice on 'Ordered quantities' 
+  in order to create an invoice based on the ordered quantity
+-
+  !record {model: sale.order, id: sale_order_so8}:
+    date_order: '2010-07-17'
+    invoice_quantity: order
+    name: Test_SO006
+    order_line:
+      - name: Slider Mobile
+        price_unit: 200
+        product_uom: product.product_uom_unit
+        product_uom_qty: 200.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_slidermobile0
+        product_uos_qty: 200.0
+        type: make_to_order
+    order_policy: manual
+    invoice_quantity: order
+    partner_id: sale.res_partner_cleartrail0
+    partner_invoice_id: sale.res_partner_address_2
+    partner_order_id: sale.res_partner_address_1
+    partner_shipping_id: sale.res_partner_address_3
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+- 
+  I confirm the Sale Order.
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so8}
+-
+  I verify that the picking has been generated for the sale order
+- 
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so8"))
+    assert so.picking_ids,"Picking has not been generated for sale_order_so8"
+-
+  Then I click on the "Products Received" button of Incoming Shipments
+-
+  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
+    date: '2010-07-17 17:52:09'
+-    
+  Then I done the picking
+- 
+  !python {model: stock.picking }: |
+    import time
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+    if picking_id:
+       pick=self.browse(cr,uid,picking_id[0])
+       pick.force_assign(cr, uid)
+       partial_datas = {
+            'partner_id':pick.address_id.partner_id.id,
+             'address_id': pick.address_id.id,
+             'delivery_date' : time.strftime('%Y-%m-%d'),
+            }
+       move = pick.move_lines[0]
+       partial_datas['move%s'%(move.id)]= {
+           'product_id': move.product_id.id,
+           'product_qty': '100',
+           'product_uom': move.product_uom.id,
+       } 
+       self.do_partial(cr, uid, [pick.id],partial_datas)
+-
+  I click on Create Invoice button to create the invoice.
+- 
+  !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so8}
+-
+  I verify whether the invoice has been generated for SO
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so8"))
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so8"
+-
+  I verify that an invoice is created on the basis of ordered quantity
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+    for so_lines in so.order_line:
+        qty=so_lines.product_uom_qty
+    ids = self.search(cr, uid, [('origin', '=', so.name)])
+    inv_brw = self.browse(cr,uid,ids)[0]
+    for inv_lines in inv_brw.invoice_line:
+        qty1=inv_lines.quantity
+    invoice_id = self.search(cr, uid, [('qty1','=', 'qty') and ('origin', '=', so.name)])
+    assert invoice_id, "Quantities are not same"
+-    
+  I open the Invoice for the SO.
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+-
+  Creating a account invoice pay entry.
+-
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
+    amount: 40000.0
+    date: '2010-07-17'
+    journal_id: sale.account_journal_bankjournal0
+    name: tst
+    period_id: account.period_5
+-
+  I pay the invoice.
+-
+  !python {model: account.invoice.pay}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+    self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
+      False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
+      "out_invoice", "active_id": so.invoice_ids[0].id, })
+-
+  Creating an account invoice pay writeoff entry.
+-
+  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
+    analytic_id: account.analytic_customers
+    comment: Write-Off
+    writeoff_acc_id: account.a_sale
+    writeoff_journal_id: sale.account_journal_bankjournal0
+-
+  Pay and Reconcile the Invoice.
+-
+  !python {model: account.invoice.pay.writeoff}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
+      {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+      [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id })
+-
+  I verify the invoice are in paid state or not. 
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+        assert (invoice.state) =='paid', "Invoice for SO is not in done state."
+-
+  I check that Paid has been set to true.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so8"))
+    assert(sale_id.invoiced == True), "Paid has not been set to true"
\ No newline at end of file
diff --git a/addons/sale/test/invoice_on_shipped_qty.yml b/addons/sale/test/invoice_on_shipped_qty.yml
new file mode 100644
index 00000000000..5a608aff9b8
--- /dev/null
+++ b/addons/sale/test/invoice_on_shipped_qty.yml
@@ -0,0 +1,154 @@
+-
+  In order to test the Sale module in OpenERP,
+  I create a Sale Order for Slider Mobile for 500 quantity having Shipping Policy 'Shipping & Manual Invoice' and Invoice on 'Shipped quantities' 
+  in order to create an invoice based on the shipping quantity
+-
+  !record {model: sale.order, id: sale_order_so6}:
+    date_order: '2010-07-17'
+    invoice_quantity: order
+    name: Test_SO006
+    order_line:
+      - name: Slider Mobile
+        price_unit: 200
+        product_uom: product.product_uom_unit
+        product_uom_qty: 200.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_slidermobile0
+        product_uos_qty: 200.0
+        type: make_to_order
+    order_policy: manual
+    invoice_quantity: procurement
+    partner_id: sale.res_partner_cleartrail0
+    partner_invoice_id: sale.res_partner_address_2
+    partner_order_id: sale.res_partner_address_1
+    partner_shipping_id: sale.res_partner_address_3
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+- 
+  I confirm the Sale Order.
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so6}
+-
+  I verify that the picking has been generated for the sale order
+- 
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so6"))
+    assert so.picking_ids,"Picking has not been generated for sale_order_so6"
+-
+  Then I click on the "Products Received" button of Incoming Shipments
+-
+  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
+    date: '2010-07-17 17:52:09'
+-    
+  Then I done the picking
+- 
+  !python {model: stock.picking }: |
+    import time
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
+    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+    if picking_id:
+       pick=self.browse(cr,uid,picking_id[0])
+       pick.force_assign(cr, uid)
+       partial_datas = {
+            'partner_id':pick.address_id.partner_id.id,
+             'address_id': pick.address_id.id,
+             'delivery_date' : time.strftime('%Y-%m-%d'),
+            }
+       move = pick.move_lines[0]
+       partial_datas['move%s'%(move.id)]= {
+           'product_id': move.product_id.id,
+           'product_qty': '100',
+           'product_uom': move.product_uom.id,
+       } 
+       self.do_partial(cr, uid, [pick.id],partial_datas)
+-
+ I click on Create Invoice button to create the invoice.
+- 
+  !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so6}
+-
+  I verify whether the invoice has been generated for SO
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so6"))
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so6"
+-
+ I verify that an invoice is created on the basis of shipped quantity
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
+    picking_obj = self.pool.get('stock.picking')
+    ids = picking_obj.search(cr, uid, [('origin', '=', so.name)])
+    pick_brw = picking_obj.browse(cr,uid, ids)[0]
+    for lines in pick_brw.move_lines:
+        qty=lines.product_qty
+    inv_id = self.search(cr, uid, [('origin', '=', so.name)])
+    inv_brw = self.browse(cr,uid,inv_id)[0]
+    for inv_lines in inv_brw.invoice_line:
+        qty1=inv_lines.quantity
+    invoice_id = self.search(cr, uid, [('qty1','=', 'qty') and ('origin', '=', so.name)])
+    assert invoice_id, "Quantities are not same"
+-    
+  I open the Invoice for the SO.
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+-
+  Creating a account invoice pay entry.
+-
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
+    amount: 20000.0
+    date: '2010-07-17'
+    journal_id: sale.account_journal_bankjournal0
+    name: tst
+    period_id: account.period_5
+-
+  I pay the invoice.
+-
+  !python {model: account.invoice.pay}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
+    self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
+      False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
+      "out_invoice", "active_id": so.invoice_ids[0].id, })
+-
+  Creating an account invoice pay writeoff entry.
+-
+  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
+    analytic_id: account.analytic_customers
+    comment: Write-Off
+    writeoff_acc_id: account.a_sale
+    writeoff_journal_id: sale.account_journal_bankjournal0
+-
+  Pay and Reconcile the Invoice.
+-
+  !python {model: account.invoice.pay.writeoff}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
+    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
+      {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+      [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id })
+-
+  I verify the invoice are in paid state or not. 
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+        assert (invoice.state) =='paid', "Invoice for SO is not in done state."
+-
+  I check that Paid has been set to true.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so6"))
+    assert(sale_id.invoiced == True), "Paid has not been set to true"
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
new file mode 100644
index 00000000000..3d7abdcf549
--- /dev/null
+++ b/addons/sale/test/manual_order_policy.yml
@@ -0,0 +1,339 @@
+-
+  In order to test the Sale module in OpenERP,
+  I create a Sale Order for Slider Mobile for 500 quantity having Shipping Policy 'Shipping & Manual Invoice'
+-
+  !record {model: sale.order, id: sale_order_so0}:
+    date_order: '2010-07-17'
+    invoice_quantity: order
+    name: Test_SO002
+    order_line:
+      - name: Slider Mobile
+        price_unit: 200
+        product_uom: product.product_uom_unit
+        product_uom_qty: 500.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_slidermobile0
+        product_uos_qty: 500.0
+        type: make_to_order
+    order_policy: manual
+    partner_id: sale.res_partner_cleartrail0
+    partner_invoice_id: sale.res_partner_address_2
+    partner_order_id: sale.res_partner_address_1
+    partner_shipping_id: sale.res_partner_address_3
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+- 
+  I confirm the Sale Order.
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
+-
+  I click on Create Invoice button to create the invoice.
+- 
+  !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so0}
+
+-
+  I verify whether the invoice has been generated for SO
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so0"))
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0" 
+-
+  I open the Invoice for the SO.
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+-
+  I verify that an invoice state has transit from draft to open state
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+    invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')])
+    assert invoice_id, "Invoice is not in the open state"
+-
+  I verify that its Journal Entries has been created
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+    invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')])
+    inv_brw = self.browse(cr, uid, invoice_id)[0]
+    assert inv_brw.move_id, "Journal Entries has not been created"
+-
+  Creating a account invoice pay entry.
+- 
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
+    amount: 100000.0
+    date: '2010-07-17'
+    journal_id: sale.account_journal_bankjournal0
+    name: test
+    period_id: account.period_5
+- 
+  I pay the invoice.
+-
+  !python {model: account.invoice.pay}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+    self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "active_model": "account.invoice", 
+      "tz":False,"record_id": so.invoice_ids[0].id, "active_ids": [so.invoice_ids[0].id], "type":
+      "out_invoice", "active_id": so.invoice_ids[0].id})
+-
+  Creating an account invoice pay writeoff entry.
+- 
+  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
+    analytic_id: account.analytic_customers
+    comment: Write-Off
+    writeoff_acc_id: account.a_sale
+    writeoff_journal_id: sale.account_journal_bankjournal0
+- 
+  Pay and Reconcile the Invoice.
+- 
+  !python {model: account.invoice.pay.writeoff}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))   
+    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
+      {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+      [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
+-
+  I verify the invoice is in done state. 
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+    invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')])
+    assert invoice_id, "Invoice for SO is not in done state."
+-
+  I verify that Paid has been set to true.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so0"))
+    assert(sale_id.invoiced == True), "Paid has not been set to true"
+-   
+  I verify that the picking has been generated for the sale order
+- 
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so0"))
+    assert so.picking_ids,"Picking has not been generated for sale_order_so0"
+-
+  I verify that delivery order has been generated for sale order
+-
+  !python {model: stock.picking }: |
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   assert (picking_id),"Delivery order has not been generated"
+-
+  I verify that a procurement has been generated for so
+-
+  !python {model: procurement.order}: |
+    from tools.translate import _
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
+    assert proc_ids, _('No Procurements!')
+-
+  Then I click on the "Run Procurement" button
+-
+  !python {model: procurement.order}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
+    for proc in proc_ids:
+      wf_service.trg_validate(uid, 'procurement.order',proc,'button_check', cr)
+-
+  I verify that a procurement state is "running"
+-
+  !python {model: procurement.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        sale_order_obj = self.pool.get('sale.order')
+        so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+        proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')])
+        assert proc_ids, _('Procurement is not in the running state!')
+-
+  I verify that a purchase order has been generated
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if(mod_brw.state == 'installed'):
+        so = self.browse(cr, uid, ref("sale_order_so0"))
+        pur_obj=self.pool.get('purchase.order')
+        pur_id=pur_obj.search(cr, uid, [('origin','=',so.name)])
+        assert pur_id, _('Purchase order has not been generated')
+    
+-
+  I click on the "Confirm" button to confirm the purchase order
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if(mod_brw.state == 'installed'):
+        pur_obj=self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so0"))
+        import netsvc
+        wf_service = netsvc.LocalService("workflow")
+        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        for pur in pur_ids:
+          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
+- 
+  I click on the "Approved by supplier" button to approve the purchase order
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        pur_obj = self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so0"))
+        import netsvc
+        wf_service = netsvc.LocalService("workflow")
+        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        for pur in pur_ids:
+          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
+-
+  I verify that a picking related to purchase order has been generated. 
+-
+  !python {model: sale.order}: |
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        pur_obj = self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so0"))
+        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        po = pur_obj.browse(cr, uid, pur_id)[0]
+        assert(po.picking_ids),"Picking for purchase order has not been generated"
+-  
+  Then I click on the "Products Received" button of Incoming Shipments
+-
+  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
+    date: '2010-07-17 17:52:09'
+-
+  I click on the "Validate" button
+-
+  !python {model: stock.picking}: |
+    modules = self.pool.get('ir.module.module')
+    sale_order_obj = self.pool.get('sale.order')
+    pur_obj = self.pool.get('purchase.order')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        po = pur_obj.browse(cr, uid, pur_id)[0]
+        pick_ser_id = self.search(cr, uid, [('purchase_id', '=', po.id )])
+        import netsvc
+        wf_service = netsvc.LocalService("workflow")
+        for pick in pick_ser_id:
+          wf_service.trg_validate(uid, 'stock.picking',pick,'button_done', cr)
+-
+  I verify that picking for purchase order has been done.
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if(mod_brw.state == 'installed'):
+        pur_obj = self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so0"))
+        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        po = pur_obj.browse(cr, uid, pur_id)[0]
+        picking_obj = self.pool.get('stock.picking')
+        ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ) and ('state', '=', 'done')])
+        assert ids, _('Picking is not in the done state!')
+-
+  Then I done the picking
+- 
+  !python {model: stock.picking }: |
+   import time
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      pick.force_assign(cr, uid)
+      partial_datas = {
+           'partner_id':pick.address_id.partner_id.id,
+            'address_id': pick.address_id.id,
+            'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+      move = pick.move_lines[0]
+      partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id.id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      } 
+      self.do_partial(cr, uid, [pick.id],partial_datas)
+-
+  I verify that picking for sale order is in done state.
+-
+  !python {model: stock.picking }: |
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+   pick = self.browse(cr,uid,picking_id[0])
+   assert (pick.state) =='done', "Picking for SO is not in done state." 
+-
+  Then I done the delivery order
+-
+  !python {model: stock.picking }: |
+   import time
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      pick.force_assign(cr, uid)
+      partial_datas = {
+           'partner_id':pick.address_id.partner_id.id,
+            'address_id': pick.address_id.id,
+            'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+      move = pick.move_lines[0]
+      partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id.id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      } 
+      self.do_partial(cr, uid, [pick.id],partial_datas)  
+-
+  I verify that delivery state is done
+-
+  !python {model: stock.picking }: |
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   pick = self.browse(cr,uid,picking_id[0])
+   assert (pick.state) =='done', "Picking for SO is not in done state."
+-
+  I verify that a "Picked" has been set to true 
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so0"))
+    assert (so.shipped == True), "Picked has not been set to True"
+-
+  I verify that a sale order is in done state
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so0"))
+    assert (so.state == 'done'), "Sale order is not in the done state."
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml
new file mode 100644
index 00000000000..d973f31d1f3
--- /dev/null
+++ b/addons/sale/test/picking_order_policy.yml
@@ -0,0 +1,329 @@
+-
+  In order to test the Sale module in OpenERP,
+  I create a Sale Order for Slider Mobile for qty 500 having Shipping Policy is 'Invoice from Picking'
+-
+  !record {model: sale.order, id: sale_order_so7}:
+    date_order: '2010-07-15'
+    invoice_quantity: order
+    name: Test_SO007
+    order_line:
+      - name: Slider Mobile
+        price_unit: 200
+        product_uom: product.product_uom_unit
+        product_uom_qty: 500.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_slidermobile0
+        product_uos_qty: 500.0
+        th_weight: 0.0
+        type: make_to_order
+    order_policy: picking
+    partner_id: sale.res_partner_cleartrail0
+    partner_invoice_id: sale.res_partner_address_2
+    partner_order_id: sale.res_partner_address_1
+    partner_shipping_id: sale.res_partner_address_3
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+-
+  I confirm the sale order.
+-
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so7}
+-
+  I verify that picking has been generated for the sale order.
+- 
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so7"))
+    assert so.picking_ids,"Picking has not been generated for sale_order_so7"
+-
+  Then I done the picking
+-
+  !python {model: stock.picking }: |
+   import time
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      pick.force_assign(cr, uid)
+      partial_datas = {
+           'partner_id':pick.address_id.partner_id.id,
+            'address_id': pick.address_id.id,
+            'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+      move = pick.move_lines[0]
+      partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id.id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      }
+      self.do_partial(cr, uid, [pick.id],partial_datas)
+-
+  Then I create invoice from picking
+-
+  !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
+    invoice_date: '2010-07-15'
+    journal_id: account.sales_journal
+    type: out_invoice
+-
+  Then I click on 'Create Invoices' button
+-
+  !python {model: stock.invoice.onshipping}: |
+    sale_obj=self.pool.get('sale.order')  
+    sale_id=sale_obj.browse(cr, uid, ref("sale_order_so7"))
+    picking_obj = self.pool.get('stock.picking')
+    ids = picking_obj.search(cr, uid, [('origin', '=', sale_id.name)])
+    self.create_invoice(cr, uid, [ref("stock_invoice_onshipping_0")], {"lang": "en_US",
+      "search_default_available": 1, "tz": False, "active_model": "stock.picking",
+      "contact_display": "partner", "active_ids": ids, "active_id": ids[0]})
+-
+  I check that an invoice has been created.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so7"))
+    assert(sale_id.invoice_ids), "Invoice has not been created"
+-
+  I open the Invoice for the SO.
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+-
+  Creating a account invoice pay entry.
+-
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
+    amount: 255000.0
+    date: '2010-07-15'
+    journal_id: sale.account_journal_bankjournal0
+    name: tst
+    period_id: account.period_5
+-
+  I pay the invoice.
+-
+  !python {model: account.invoice.pay}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+    self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
+      False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
+      "out_invoice", "active_id": so.invoice_ids[0].id, })
+-
+  Creating an account invoice pay writeoff entry.
+-
+  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
+    analytic_id: account.analytic_customers
+    comment: Write-Off
+    writeoff_acc_id: account.a_sale
+    writeoff_journal_id: sale.account_journal_bankjournal0
+-
+  Pay and Reconcile the Invoice.
+-
+  !python {model: account.invoice.pay.writeoff}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
+      {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+      [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id })
+-
+  I verify the invoice are in paid state or not. 
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+        assert (invoice.state) =='paid', "Invoice for SO is not in done state."
+-
+  I check that Paid has been set to true.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so7"))
+    assert(sale_id.invoiced == True), "Paid has not been set to true"
+-
+  I verify that a procurement has been generated for so
+-
+  !python {model: procurement.order}: |
+    from tools.translate import _
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
+    assert proc_ids, _('No Procurements!')
+-
+  Then I click on the "Run Procurement" button
+-
+  !python {model: procurement.order}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
+    for proc in proc_ids:
+      wf_service.trg_validate(uid, 'procurement.order',proc,'button_check', cr)
+-
+  I verify that a procurement state is "running"
+-
+  !python {model: procurement.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        sale_order_obj = self.pool.get('sale.order')
+        so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+        proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')])
+        assert proc_ids, _('Procurement is not in the running state!')
+-
+  I verify that a purchase order has been generated
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        so = self.browse(cr, uid, ref("sale_order_so7"))
+        pur_obj=self.pool.get('purchase.order')
+        pur_id=pur_obj.search(cr, uid, [('origin','=',so.name)])
+        assert pur_id, _('Purchase order has not been generated')
+-
+  I click on the "Confirm" button to confirm the purchase order
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        pur_obj=self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so7"))
+        import netsvc
+        wf_service = netsvc.LocalService("workflow")
+        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        for pur in pur_ids:
+          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
+- 
+  I click on the "Approved by supplier" button to approve the purchase order
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        pur_obj = self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so7"))
+        import netsvc
+        wf_service = netsvc.LocalService("workflow")
+        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        for pur in pur_ids:
+          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
+-
+  I verify that a picking related to purchase order has been generated. 
+-
+  !python {model: sale.order}: |
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        pur_obj = self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so7"))
+        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        po = pur_obj.browse(cr, uid, pur_id)[0]
+        assert(po.picking_ids),"Picking for purchase order has not been generated"
+-  
+  Then I click on the "Products Received" button of Incoming Shipments
+-
+  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
+    date: '2010-07-15 17:52:09'
+-
+  I click on the "Validate" button
+-
+  !python {model: stock.picking}: |
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        sale_order_obj = self.pool.get('sale.order')
+        pur_obj = self.pool.get('purchase.order')
+        so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        po = pur_obj.browse(cr, uid, pur_id)[0]
+        pick_ser_id = self.search(cr, uid, [('purchase_id', '=', po.id )])
+        import netsvc
+        wf_service = netsvc.LocalService("workflow")
+        for pick in pick_ser_id:
+          wf_service.trg_validate(uid, 'stock.picking',pick,'button_done', cr)
+-
+  I verify that picking for purchase order has been done.
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        pur_obj = self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so7"))
+        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        po = pur_obj.browse(cr, uid, pur_id)[0]
+        picking_obj = self.pool.get('stock.picking')
+        ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ) and ('state', '=', 'done')])
+        assert ids, _('Picking is not in the done state!')
+-
+  I verify that delivery order has been generated for sale order
+-
+  !python {model: stock.picking }: |
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   assert (picking_id),"Delivery order has not been generated"
+-
+  I verify that delivery has been done
+-
+  !python {model: stock.picking }: |
+   import time
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      pick.force_assign(cr, uid)
+      partial_datas = {
+           'partner_id':pick.address_id.partner_id.id,
+            'address_id': pick.address_id.id,
+            'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+      move = pick.move_lines[0]
+      partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id.id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      } 
+      self.do_partial(cr, uid, [pick.id],partial_datas)  
+-
+  I verify that delivery state is done
+-
+  !python {model: stock.picking }: |
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   if picking_id:
+     pick = self.browse(cr,uid,picking_id[0])
+     assert (pick.state) =='done', "Picking for SO is not in done state."
+-
+  I verify that a "Picked" has been set to true 
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so7"))
+    assert (so.shipped == True), "Picked has not been set to True"
+-  
+  I verify that a sale order is in done state
+-
+   !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so7"))
+    assert (so.state == 'done'), "Sale order is not in the done state."
+
diff --git a/addons/sale/test/postpaid_order_policy.yml b/addons/sale/test/postpaid_order_policy.yml
new file mode 100644
index 00000000000..056a8327435
--- /dev/null
+++ b/addons/sale/test/postpaid_order_policy.yml
@@ -0,0 +1,330 @@
+-
+  In order to test the Sale module in OpenERP,
+  I create a Sale Order for Slider Mobile for qty 500 having Shipping Policy is 'Invoice on order after Delivery'
+-
+  !record {model: sale.order, id: sale_order_so8}:
+    date_order: '2010-07-15'
+    invoice_quantity: order
+    name: Test_SO008
+    order_line:
+      - name: Slider Mobile
+        price_unit: 200.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 500.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_slidermobile0
+        product_uos_qty: 500.0
+        type: make_to_order
+    order_policy: postpaid
+    partner_id: sale.res_partner_cleartrail0
+    partner_invoice_id: sale.res_partner_address_2
+    partner_order_id: sale.res_partner_address_1
+    partner_shipping_id: sale.res_partner_address_3
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+- 
+  I confirm the Sale Order.
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so8} 
+-
+  I verify that the picking has been generated for the sale order
+- 
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so8"))
+    assert so.picking_ids,"Picking has not been generated for sale_order_so8"
+-
+  Then I done the picking
+- 
+  !python {model: stock.picking }: |
+   import time
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      pick.force_assign(cr, uid)
+      partial_datas = {
+           'partner_id':pick.address_id.partner_id.id,
+            'address_id': pick.address_id.id,
+            'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+      move = pick.move_lines[0]
+      partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id.id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      } 
+      self.do_partial(cr, uid, [pick.id],partial_datas)
+-
+  I verify that picking order is in done state.
+-
+  !python {model: stock.picking }: |
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+   if picking_id:
+     pick = self.browse(cr,uid,picking_id[0])
+     assert (pick.state == 'done'), "Picking for SO is not in done state." 
+-
+  I verify that delivery order has been generated for sale order
+-
+  !python {model: stock.picking }: |
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   assert (picking_id),"Delivery order has not been generated"
+-
+  I click on the Products Sent button and then on the Validate button
+-
+  !python {model: stock.picking }: |
+   import time
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      pick.force_assign(cr, uid)
+      partial_datas = {
+           'partner_id':pick.address_id.partner_id.id,
+            'address_id': pick.address_id.id,
+            'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+      move = pick.move_lines[0]
+      partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id.id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      } 
+      self.do_partial(cr, uid, [pick.id],partial_datas)  
+-
+  I verify that delivery state is done
+-
+  !python {model: stock.picking }: |
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   if picking_id:
+     pick = self.browse(cr,uid,picking_id[0])
+     assert (pick.state) =='done', "Picking for SO is not in done state."
+-
+  I verify that a procurement has been generated for so
+-
+  !python {model: procurement.order}: |
+    from tools.translate import _
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
+    assert proc_ids, _('No Procurements!')
+-
+  Then I click on the "Run Procurement" button
+-
+  !python {model: procurement.order}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
+    for proc in proc_ids:
+      wf_service.trg_validate(uid, 'procurement.order',proc,'button_check', cr)
+-
+  I verify that a procurement state is "running"
+-
+  !python {model: procurement.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        sale_order_obj = self.pool.get('sale.order')
+        so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+        proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')])
+-
+  I verify that a purchase order has been generated
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        so = self.browse(cr, uid, ref("sale_order_so8"))
+        pur_obj=self.pool.get('purchase.order')
+        pur_id=pur_obj.search(cr, uid, [('origin','=',so.name)])
+        assert pur_id, _('Purchase order has not been generated')
+-
+  I click on the "Confirm" button to confirm the purchase order
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        pur_obj=self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so8"))
+        import netsvc
+        wf_service = netsvc.LocalService("workflow")
+        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        for pur in pur_ids:
+          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
+- 
+  I click on the "Approved by supplier" button to approve the purchase order
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        pur_obj = self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so8"))
+        import netsvc
+        wf_service = netsvc.LocalService("workflow")
+        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        for pur in pur_ids:
+          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
+-
+  I verify that a picking related to purchase order has been generated. 
+-
+  !python {model: sale.order}: |
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        pur_obj = self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so8"))
+        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        po = pur_obj.browse(cr, uid, pur_id)[0]
+        assert(po.picking_ids),"Picking for purchase order has not been generated"
+-  
+  Then I click on the "Products Received" button of Incoming Shipments
+-
+  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
+    date: '2010-07-15 17:52:09'
+-
+  I click on the "Validate" button
+-
+  !python {model: stock.picking}: |
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        sale_order_obj = self.pool.get('sale.order')
+        pur_obj = self.pool.get('purchase.order')
+        so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        po = pur_obj.browse(cr, uid, pur_id)[0]
+        pick_ser_id = self.search(cr, uid, [('purchase_id', '=', po.id )])
+        import netsvc
+        wf_service = netsvc.LocalService("workflow")
+        for pick in pick_ser_id:
+          wf_service.trg_validate(uid, 'stock.picking',pick,'button_done', cr)
+-
+  I verify that picking for purchase order has been done.
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        pur_obj = self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so8"))
+        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        po = pur_obj.browse(cr, uid, pur_id)[0]
+        picking_obj = self.pool.get('stock.picking')
+        ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ) and ('state', '=', 'done')])
+        assert ids, _('Picking is not in the done state!')
+-
+  I verify that a "Picked" has been set to true 
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so8"))
+    assert (so.shipped == True), "Picking is not done."
+-
+  I verify that an invoice has been generated for SO
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so8"))
+    assert so.invoice_ids, "Invoice has not been generated"
+- 
+  I open the Invoice for the SO.
+- 
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")  
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) 
+-
+  Creating a account invoice pay entry.
+- 
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
+    amount: 100000.0
+    date: '2010-07-15'
+    journal_id: sale.account_journal_bankjournal0
+    name: test
+    period_id: account.period_5
+- 
+  I pay the invoice.
+- 
+  !python {model: account.invoice.pay}: |
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        sale_order_obj = self.pool.get('sale.order')
+        so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))  
+        self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "tz":
+          False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
+          "out_invoice", "active_id": so.invoice_ids[0].id})
+- 
+  Creating an account invoice pay writeoff entry.
+- 
+  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
+    analytic_id: account.analytic_customers
+    comment: Write-Off
+    writeoff_acc_id: account.a_sale
+    writeoff_journal_id: sale.account_journal_bankjournal0
+- 
+  Pay and Reconcile the Invoice.
+- 
+  !python {model: account.invoice.pay.writeoff}: |
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        sale_order_obj = self.pool.get('sale.order')
+        so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))   
+        self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
+          {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+          [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
+-
+  I verify the invoice are in paid state or not. 
+-
+  !python {model: account.invoice}: |
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        sale_order_obj = self.pool.get('sale.order')
+        so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+        invoice_ids = so.invoice_ids
+        for invoice in invoice_ids:
+            assert (invoice.state) =='paid', "Invoice for SO is not in done state."
+-    
+  I verify that Paid has been set to true.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so8"))
+    assert(sale_id.invoiced == True), "Paid has not been set to true"
+-  
+  I verify that sale order is in done state
+-
+   !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so8"))
+    assert (so.state == 'done'), "Sale order is not in the done state."
\ No newline at end of file
diff --git a/addons/sale/test/prepaid_order_policy.yml b/addons/sale/test/prepaid_order_policy.yml
new file mode 100644
index 00000000000..fd7f04bede0
--- /dev/null
+++ b/addons/sale/test/prepaid_order_policy.yml
@@ -0,0 +1,284 @@
+-    
+  I create a Sale Order for LG Viewty Smart for qty 500 having Shipping Policy is 'Payment Before Delivery'
+-
+  !record {model: sale.order, id: sale_order_so1}:
+    date_order: '2010-07-20'
+    invoice_quantity: order
+    name: Test_SO001
+    order_line:
+      - name: Slider Mobile
+        price_unit: 200
+        product_uom: product.product_uom_unit
+        product_uom_qty: 500.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_slidermobile0
+        product_uos_qty: 500.0
+        th_weight: 0.0
+        type: make_to_order
+    order_policy: prepaid
+    partner_id: sale.res_partner_cleartrail0
+    partner_invoice_id: sale.res_partner_address_2
+    partner_order_id: sale.res_partner_address_1
+    partner_shipping_id: sale.res_partner_address_3
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+-
+  I confirm the sale order.
+-
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so1}
+-
+  I verify whether the invoice has been generated for SO since Shipping policy is 'Payment Before Delivery'
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so1"))
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so1"
+-
+  I verify there are no pickings attached to this sale order
+-
+  !python {model: stock.picking }: |
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+   picking_id = self.search(cr, uid, [('origin','!=',so.name),(('type','=','out')and('type','=','delivery'))])
+   assert picking_id,"There is a picking attached to this sale order"
+-
+  I open the Invoice for the SO.
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+-
+  Creating a account invoice pay entry.
+-
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
+    amount: 85000.0
+    date: '2010-07-20'
+    journal_id: sale.account_journal_bankjournal0
+    name: tst
+    period_id: account.period_5
+-
+  I pay the invoice.
+-
+  !python {model: account.invoice.pay}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+    self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
+      False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
+      "out_invoice", "active_id": so.invoice_ids[0].id, })
+-
+  Creating an account invoice pay writeoff entry.
+- 
+  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
+    analytic_id: account.analytic_customers
+    comment: Write-Off
+    writeoff_acc_id: account.a_sale
+    writeoff_journal_id: sale.account_journal_bankjournal0
+- 
+  Pay and Reconcile the Invoice.
+- 
+  !python {model: account.invoice.pay.writeoff}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))   
+    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
+      {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+      [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
+-
+  I verify the invoice is in done state or not. 
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+    invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')])
+    assert invoice_id, "Invoice for SO is not in done state."
+-
+  I check that Paid has been set to true.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so1"))
+    assert(sale_id.invoiced == True), "Paid has not been set to true"
+-
+  I verify the picking associated with the sale order sale_order_so1
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so1"))
+    assert so.picking_ids,"Picking has not been generated"
+-
+  Products are delivered to the Cleartrail Customer.
+-
+  !python {model: stock.picking }: |
+   import time
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      pick.force_assign(cr, uid)
+      partial_datas = {
+           'partner_id':pick.address_id.partner_id.id,
+            'address_id': pick.address_id.id,
+            'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+      move = pick.move_lines[0]
+      partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id.id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      }
+      self.do_partial(cr, uid, [pick.id],partial_datas)
+-
+  I verify that picking order is in done state.
+-
+  !python {model: stock.picking }: |
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+   pick = self.browse(cr,uid,picking_id[0])
+   assert (pick.state) =='done', "Picking for SO is not in done state."
+-
+  I verify that a procurement has been generated for so
+-
+  !python {model: procurement.order}: |
+    from tools.translate import _
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
+    assert proc_ids, _('No Procurements!')
+-
+  Then I click on the "Run Procurement" button
+- 
+  !python {model: procurement.order}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
+    for proc in proc_ids:
+      wf_service.trg_validate(uid, 'procurement.order',proc,'button_check', cr)
+-
+  I verify that a procurement state is "running"
+-
+  !python {model: procurement.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if(mod_brw.state == 'installed'):
+        sale_order_obj = self.pool.get('sale.order')
+        so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+        proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')])
+        assert proc_ids, _('Procurement is not in the running state!')
+-
+  I verify that a purchase order has been generated
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if(mod_brw.state == 'installed'):
+        so = self.browse(cr, uid, ref("sale_order_so1"))
+        pur_obj=self.pool.get('purchase.order')
+        pur_id=pur_obj.search(cr, uid, [('origin','=',so.name)])
+        assert pur_id, _('Purchase order has not been generated')
+- 
+  I click on the "Confirm" button to confirm the purchase order
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if(mod_brw.state == 'installed'):
+        pur_obj=self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so1"))
+        import netsvc
+        wf_service = netsvc.LocalService("workflow")
+        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        for pur in pur_ids:
+          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
+- 
+  I click on the "Approved by supplier" button to approve the purchase order
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        pur_obj = self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so1"))
+        import netsvc
+        wf_service = netsvc.LocalService("workflow")
+        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        for pur in pur_ids:
+          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr) 
+-
+  I verify that a picking related to purchase order has been generated. 
+-
+  !python {model: sale.order}: |
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        pur_obj = self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so1"))
+        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        po = pur_obj.browse(cr, uid, pur_id)[0]
+        assert(po.picking_ids),"Picking for purchase order has not been generated"
+-
+  Then I click on the "Products Received" button of Incoming Shipments
+-
+  !record {model: stock.partial.picking, id: stock_partial_picking_0}:
+    date: '2010-07-20 17:52:09'
+-
+  I click on the "Validate" button
+-
+  !python {model: stock.picking}: |
+    modules = self.pool.get('ir.module.module')
+    sale_order_obj = self.pool.get('sale.order')
+    pur_obj = self.pool.get('purchase.order')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if (mod_brw.state == 'installed'):
+        so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        po = pur_obj.browse(cr, uid, pur_id)[0]
+        pick_ser_id = self.search(cr, uid, [('purchase_id', '=', po.id )])
+        import netsvc
+        wf_service = netsvc.LocalService("workflow")
+        for pick in pick_ser_id:
+          wf_service.trg_validate(uid, 'stock.picking',pick,'button_done', cr)
+-
+  I verify that picking for purchase order has been done.
+-
+  !python {model: sale.order}: |
+    from tools.translate import _
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
+    mod_brw = modules.browse(cr,uid,mod_pur)[0]
+    if(mod_brw.state == 'installed'):
+        pur_obj = self.pool.get('purchase.order')
+        so = self.browse(cr, uid, ref("sale_order_so1"))
+        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
+        po = pur_obj.browse(cr, uid, pur_id)[0]
+        picking_obj = self.pool.get('stock.picking')
+        ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ) and ('state', '=', 'done')])
+        assert ids, _('Picking is not in the done state!')
+-
+  I verify that a "Picked" has been set to true 
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so1"))
+    assert (so.shipped == True), "Picking is not done."
+-
+  I verify that a sale order is in done state
+-
+   !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so1"))
+    assert (so.state == 'done'), "Sale order is not in the done state."
diff --git a/addons/sale/test/shipping_manual_sale_order.yml b/addons/sale/test/shipping_manual_sale_order.yml
deleted file mode 100644
index 1f5bc5fe10a..00000000000
--- a/addons/sale/test/shipping_manual_sale_order.yml
+++ /dev/null
@@ -1,384 +0,0 @@
--
-  In order to test the sale module, I need to configure details regarding product & customer.
--
-  I am going to sell my Mobile products to the customer with name Cleartrail
-- 
-  I create View Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_view0}:
-    close_method: none
-    code: View
-    name: View
-    sign: 1
-- 
-  I create Income Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_income0}:
-    close_method: unreconciled
-    code: Income
-    name: Income
-    sign: 1
-- 
-  I create Expense Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_expense0}:
-    close_method: unreconciled
-    code: Expense
-    name: Expense
-    sign: 1
-- 
-  I create Cash Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_cash0}:
-    close_method: balance
-    code: Cash
-    name: Cash
-    sign: 1
-- 
-  I create Minimal Chart Account.
-- 
-  !record {model: account.account, id: account_account_minimalchart0}:
-    code: '0'
-    company_id: base.main_company
-    currency_mode: current
-    name: Minimal Chart
-    parent_left: 1
-    parent_right: 12
-    type: view
-    user_type: account_account_type_view0
-- 
-  I create Payable Account.
-- 
-  !record {model: account.account, id: account_account_payable1}:
-    code: AP
-    company_id: base.main_company
-    currency_mode: current
-    name: Payable
-    parent_id: account_account_minimalchart0
-    parent_left: 2
-    parent_right: 3
-    reconcile: true
-    type: payable
-    user_type: account_account_type_expense0
-- 
-  I create Receivable Account.
-- 
-  !record {model: account.account, id: account_account_receivable0}:
-    code: AR
-    company_id: base.main_company
-    currency_mode: current
-    name: Receivable
-    parent_id: account_account_minimalchart0
-    parent_left: 4
-    parent_right: 5
-    reconcile: true
-    type: receivable
-    user_type: account_account_type_income0
-- 
-  I create Cash Account.
-- 
-  !record {model: account.account, id: account_account_cash0}:
-    code: C
-    company_id: base.main_company
-    currency_mode: current
-    name: Cash
-    parent_id: account_account_minimalchart0
-    parent_left: 6
-    parent_right: 7
-    type: other
-    user_type: account_account_type_cash0
-- 
-  I create Purchases Account.
-- 
-  !record {model: account.account, id: account_account_purchases0}:
-    code: P
-    company_id: base.main_company
-    currency_mode: current
-    name: Purchases
-    parent_id: account_account_minimalchart0
-    parent_left: 8
-    parent_right: 9
-    type: other
-    user_type: account_account_type_expense0
-- 
-  I create Sales Account.
-- 
-  !record {model: account.account, id: account_account_sales0}:
-    code: S
-    company_id: base.main_company
-    currency_mode: current
-    name: Sales
-    parent_id: account_account_minimalchart0
-    parent_left: 10
-    parent_right: 11
-    type: other
-    user_type: account_account_type_income0
-- 
-  I create Purchase Journal.
-- 
-  !record {model: account.journal, id: account_journal_purchasejournal0}:
-    code: PUJ
-    company_id: base.main_company
-    default_credit_account_id: account_account_purchases0
-    default_debit_account_id: account_account_purchases0
-    name: Purchase Journal
-    sequence_id: account.sequence_purchase_journal
-    type: purchase
-    view_id: account.account_journal_view
-- 
-  I create Sale Journal.
-- 
-  !record {model: account.journal, id: account_journal_salejournal0}:
-    code: SAJ
-    company_id: base.main_company
-    default_credit_account_id: account_account_sales0
-    default_debit_account_id: account_account_sales0
-    name: Sale Journal
-    sequence_id: account.sequence_sale_journal
-    type: sale
-    view_id: account.account_journal_view
-- 
-  I create Bank Journal.
-- 
-  !record {model: account.journal, id: account_journal_bankjournal0}:
-    code: BNK
-    company_id: base.main_company
-    default_credit_account_id: account_account_cash0
-    default_debit_account_id: account_account_cash0
-    name: Bank Journal
-    sequence_id: account.sequence_journal
-    type: cash
-    view_id: account.account_journal_bank_view
-- 
-  I create ir.property for account payable.
-- 
-  !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
-    company_id: base.main_company
-    fields_id: account.field_res_partner_property_account_payable
-    name: property_account_expense_categ
-    value_reference: account.account,5
-- 
-  I create ir.property for account receivable.
-- 
-  !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
-    company_id: base.main_company
-    fields_id: account.field_res_partner_property_account_receivable
-    name: property_account_income_categ
-    value_reference: account.account,6
-- 
-  I create Partner category Customers.
-- 
-  !record {model: res.partner.category, id: res_partner_category_customers0}:
-    name: Customers
--
-  I create Cleartrail Customer.
-- 
-  !record {model: res.partner, id: res_partner_cleartrail0}:
-    category_id:
-      - res_partner_category_customers0
-    name: Cleartrail
-- 
-  I create contact address for Cleartrail.
-- 
-  !record {model: res.partner.address, id: res_partner_address_1}:
-    partner_id: res_partner_cleartrail0
-    street: onam plaza, 14 B palasia A B Road
-    type: contact
-- 
-  I create invoice address for Cleartrail.
-- 
-  !record {model: res.partner.address, id: res_partner_address_2}:
-    partner_id: res_partner_cleartrail0
-    street: sarda house 24 B palasia, A B Road
-    type: invoice
-- 
-  I create delivery address for Cleartrail.
-- 
-  !record {model: res.partner.address, id: res_partner_address_3}:
-    partner_id: res_partner_cleartrail0
-    street: sangam house 15 B palasia, A B Road
-    type: delivery
--
-  Customer Cleartrail has specific instrument requirement regarding the stockable products.
-- 
-  I define product category Mobile Products Sellable.
-- 
-  !record {model: product.category, id: product_category_allproductssellable0}:
-    name: Mobile Products Sellable
-- 
-  I define product category Mobile Services. 
-- 
-  !record {model: product.category, id: product_category_services0}:
-    name: Mobile Services
-- 
-  I define New Chocolate Slider Mobile template.
-- 
-  !record {model: product.template, id: product_template_newchocolateslidermobile0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 200.0
-    mes_type: fixed
-    name: New Chocolate Slider Mobile
-    procure_method: make_to_order
-    standard_price: 189.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-- 
-  I define New Chocolate Slider Mobile.
-- 
-  !record {model: product.product, id: product_product_newchocolateslidermobile0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 200.0
-    mes_type: fixed
-    name: New Chocolate Slider Mobile
-    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 189.00\n'
-    pricelist_sale: 'Public Pricelist (0.00) : 200.00\n'
-    procure_method: make_to_order
-    property_account_expense: sale.account_account_payable1
-    property_account_income: sale.account_account_receivable0
-    seller_delay: '1'
-    standard_price: 189.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-- 
-  I create a Sale Order for LG Viewty Smart for qty 500 having order_policy manual.
--
-  !record {model: sale.order, id: sale_order_so0}:
-    date_order: '2010-05-12'
-    invoice_quantity: order
-    name: Test_SO002
-    order_line:
-      - name: New Chocolate Slider Mobile
-        price_unit: 200.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 500.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_newchocolateslidermobile0
-        product_uos_qty: 500.0
-        type: make_to_order
-    order_policy: manual
-    partner_id: sale.res_partner_cleartrail0
-    partner_invoice_id: sale.res_partner_address_2
-    partner_order_id: sale.res_partner_address_1
-    partner_shipping_id: sale.res_partner_address_3
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
-- 
-  I confirm the Sale Order.
-- 
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
--
-  I click on Create Invoice button to create the invoice.
-- 
-  !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so0}
--
-  I verify whether the invoice has been generated for SO
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"
-- 
-  I open the Invoice for the SO.
-- 
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")  
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) 
--
-  Creating a account invoice pay entry.
-- 
-  !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
-    amount: 100000.0
-    date: '2010-05-10'
-    journal_id: sale.account_journal_bankjournal0
-    name: test
-    period_id: account.period_5
-- 
-  I pay the invoice.
-- 
-  !python {model: account.invoice.pay}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))  
-    self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "tz":
-      False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
-      "out_invoice", "active_id": so.invoice_ids[0].id})
-    
-    
-- 
-  Creating an account invoice pay writeoff entry.
-- 
-  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
-    analytic_id: account.analytic_customers
-    comment: Write-Off
-    writeoff_acc_id: account.a_sale
-    writeoff_journal_id: sale.account_journal_bankjournal0
-    
-    
-- 
-  Pay and Reconcile the Invoice.
-- 
-  !python {model: account.invoice.pay.writeoff}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))   
-    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
-      {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
-      [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
--
-  I verify the invoice are in paid state or not. 
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-        assert (invoice.state) =='paid', "Invoice for SO is not in done state."
-- 
-  I verify the picking associated with the sale order sale_order_so0.
-- 
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    assert so.picking_ids,"Picking has not been generated for sale_order_so0"
--
-  Products are delivered to the Cleartrail Customer.
-- 
-  !python {model: stock.picking }: |
-   import time
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      pick.force_assign(cr, uid)
-      partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-            'address_id': pick.address_id.id,
-            'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-      move = pick.move_lines[0]
-      partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id.id,
-          'product_qty': move.product_qty,
-          'product_uom': move.product_uom.id,
-      } 
-      self.do_partial(cr, uid, [pick.id],partial_datas)
--
-  I verify that picking order is in done state.
--
-  !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   if picking_id:
-     pick = self.browse(cr,uid,picking_id[0])
-     assert (pick.state) =='done', "Picking for SO is not in done state." 
diff --git a/addons/sale/test/so_make_line_invoice.yml b/addons/sale/test/so_make_line_invoice.yml
index c09e4bf2c11..9725a169b2c 100644
--- a/addons/sale/test/so_make_line_invoice.yml
+++ b/addons/sale/test/so_make_line_invoice.yml
@@ -1,307 +1,29 @@
 -
-  In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
--
-  I am going to sell my Mobile products to the customer with name Cleartrail
-- 
-  I create View Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_view0}:
-    close_method: none
-    code: View
-    name: View
-    sign: 1
-- 
-  I create Income Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_income0}:
-    close_method: unreconciled
-    code: Income
-    name: Income
-    sign: 1
-- 
-  I create Expense Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_expense0}:
-    close_method: unreconciled
-    code: Expense
-    name: Expense
-    sign: 1
-- 
-  I create Cash Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_cash0}:
-    close_method: balance
-    code: Cash
-    name: Cash
-    sign: 1
-- 
-  I create Minimal Chart Account.
-- 
-  !record {model: account.account, id: account_account_minimalchart0}:
-    code: '0'
-    company_id: base.main_company
-    currency_mode: current
-    name: Minimal Chart
-    parent_left: 1
-    parent_right: 12
-    type: view
-    user_type: account_account_type_view0
-- 
-  I create Payable Account.
-- 
-  !record {model: account.account, id: account_account_payable1}:
-    code: AP
-    company_id: base.main_company
-    currency_mode: current
-    name: Payable
-    parent_id: account_account_minimalchart0
-    parent_left: 2
-    parent_right: 3
-    reconcile: true
-    type: payable
-    user_type: account_account_type_expense0
-- 
-  I create Receivable Account.
-- 
-  !record {model: account.account, id: account_account_receivable0}:
-    code: AR
-    currency_mode: current
-    name: Receivable
-    parent_id: account_account_minimalchart0
-    parent_left: 4
-    parent_right: 5
-    reconcile: true
-    type: receivable
-    user_type: account_account_type_income0
-- 
-  I create Cash Account.
-- 
-  !record {model: account.account, id: account_account_cash0}:
-    code: C
-    currency_mode: current
-    name: Cash
-    parent_id: account_account_minimalchart0
-    parent_left: 6
-    parent_right: 7
-    type: other
-    user_type: account_account_type_cash0
-- 
-  I create Purchases Account.
-- 
-  !record {model: account.account, id: account_account_purchases0}:
-    code: P
-    company_id: base.main_company
-    currency_mode: current
-    name: Purchases
-    parent_id: account_account_minimalchart0
-    parent_left: 8
-    parent_right: 9
-    type: other
-    user_type: account_account_type_expense0
-- 
-  I create Sales Account.
-- 
-  !record {model: account.account, id: account_account_sales0}:
-    code: S
-    company_id: base.main_company
-    currency_mode: current
-    name: Sales
-    parent_id: account_account_minimalchart0
-    parent_left: 10
-    parent_right: 11
-    type: other
-    user_type: account_account_type_income0
-- 
-  I create Purchase Journal.
-- 
-  !record {model: account.journal, id: account_journal_purchasejournal0}:
-    code: PUJ
-    company_id: base.main_company
-    default_credit_account_id: account_account_purchases0
-    default_debit_account_id: account_account_purchases0
-    name: Purchase Journal
-    sequence_id: account.sequence_purchase_journal
-    type: purchase
-    view_id: account.account_journal_view
-- 
-  I create Sale Journal.
-- 
-  !record {model: account.journal, id: account_journal_salejournal0}:
-    code: SAJ
-    company_id: base.main_company
-    default_credit_account_id: account_account_sales0
-    default_debit_account_id: account_account_sales0
-    name: Sale Journal
-    sequence_id: account.sequence_sale_journal
-    type: sale
-    view_id: account.account_journal_view
-- 
-  I create Bank Journal.
-- 
-  !record {model: account.journal, id: account_journal_bankjournal0}:
-    code: BNK
-    default_credit_account_id: account_account_cash0
-    default_debit_account_id: account_account_cash0
-    name: Bank Journal
-    sequence_id: account.sequence_journal
-    type: cash
-    view_id: account.account_journal_bank_view
-- 
-  I create ir.property for account payable.
-- 
-  !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
-    company_id: base.main_company
-    fields_id: account.field_res_partner_property_account_payable
-    name: property_account_expense_categ
-    value_reference: account.account,5
-- 
-  I create ir.property for account receivable.
-- 
-  !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
-    company_id: base.main_company
-    fields_id: account.field_res_partner_property_account_receivable
-    name: property_account_income_categ
-    value_reference: account.account,6
-- 
-  I create Partner category Customers.
-- 
-  !record {model: res.partner.category, id: res_partner_category_customers0}:
-    name: Customers
--
-  I create Cleartrail Customer.
-- 
-  !record {model: res.partner, id: res_partner_cleartrail0}:
-    category_id:
-      - res_partner_category_customers0
-    name: Cleartrail
-- 
-  I create contact address for Cleartrail.
-- 
-  !record {model: res.partner.address, id: res_partner_address_1}:
-    partner_id: res_partner_cleartrail0
-    street: onam plaza, 14 B palasia A B Road
-    type: contact
-- 
-  I create invoice address for Cleartrail.
-- 
-  !record {model: res.partner.address, id: res_partner_address_2}:
-    partner_id: res_partner_cleartrail0
-    street: sarda house 24 B palasia, A B Road
-    type: invoice
-- 
-  I create delivery address for Cleartrail.
-- 
-  !record {model: res.partner.address, id: res_partner_address_3}:
-    partner_id: res_partner_cleartrail0
-    street: sangam house 15 B palasia, A B Road
-    type: delivery
--
-  Customer Cleartrail has specific instrument requirement regarding the stockable products.
-- 
-  I define product category Mobile Products Sellable.
-- 
-  !record {model: product.category, id: product_category_allproductssellable0}:
-    name: Mobile Products Sellable
-- 
-  I define product category Mobile Services. 
-- 
-  !record {model: product.category, id: product_category_services0}:
-    name: Mobile Services
-- 
-  I define LG Viewty Smart product template.
-- 
-  !record {model: product.template, id: product_template_lgviewtysmart0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 170.0
-    mes_type: fixed
-    name: LG Viewty Smart
-    procure_method: make_to_order
-    standard_price: 160.0
-    supply_method: produce
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--    
-  I define LG Viewty Smart product.
-- 
-  !record {model: product.product, id: product_product_lgviewtysmart0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 170.0
-    mes_type: fixed
-    name: LG Viewty Smart
-    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 160.00\n'
-    pricelist_sale: 'Public Pricelist (0.00) : 170.00\n'
-    procure_method: make_to_order
-    property_account_expense: sale.account_account_payable1
-    property_account_income: sale.account_account_receivable0
-    seller_delay: '1'
-    standard_price: 160.0
-    supply_method: produce
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
-  I define New Chocolate Slider Mobile template.
-- 
-  !record {model: product.template, id: product_template_newchocolateslidermobile0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 200.0
-    mes_type: fixed
-    name: New Chocolate Slider Mobile
-    procure_method: make_to_order
-    standard_price: 189.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-- 
-  I define New Chocolate Slider Mobile.
-- 
-  !record {model: product.product, id: product_product_newchocolateslidermobile0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 200.0
-    mes_type: fixed
-    name: New Chocolate Slider Mobile
-    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 189.00\n'
-    pricelist_sale: 'Public Pricelist (0.00) : 200.00\n'
-    procure_method: make_to_order
-    property_account_expense: sale.account_account_payable1
-    property_account_income: sale.account_account_receivable0
-    seller_delay: '1'
-    standard_price: 189.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-- 
-  I create a Sale Order for LG Viewty Smart for qty 500 having order_policy manual.
+  In order to test the invoices based on sale order lines of sales module in OpenERP
+  I create a Sale Order for two products LG Viewty Smart and Slider mobile for qty 100 having order_policy manual.
 -
   !record {model: sale.order, id: sale_order_so3}:
-    date_order: '2010-05-12'
+    date_order: '2010-07-12'
     invoice_quantity: order
     name: Test_SO003
     order_line:
-      - name: New Chocolate Slider Mobile
+      - name: Slider Mobile
         price_unit: 200.0
         product_uom: product.product_uom_unit
-        product_uom_qty: 500.0
+        product_uom_qty: 100.0
         state: draft
         delay: 7.0
-        product_id: sale.product_product_newchocolateslidermobile0
-        product_uos_qty: 500.0
+        product_id: sale.product_product_slidermobile0
+        product_uos_qty: 100.0
         type: make_to_order
       - name: LG Viewty Smart
         price_unit: 170.0
         product_uom: product.product_uom_unit
-        product_uom_qty: 500.0
+        product_uom_qty: 100.0
         state: draft
         delay: 7.0
         product_id: sale.product_product_lgviewtysmart0
-        product_uos_qty: 500.0
+        product_uos_qty: 100.0
         th_weight: 0.0
         type: make_to_order      
     order_policy: manual
@@ -317,23 +39,205 @@
 - 
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3}
 -
-  I create an invoice on sale order line. 
+  I click on the "Create Invoice" button of sale order line
 - 
-  !record {model: sale.order.line.make.invoice, id: sale_order_line_make_invoice_0}:
-    {}
-- 
-  invoice is created for specific sale order line.
-- 
-  !python {model: sale.order.line.make.invoice}: |
+  !python {model: sale.order.line}: |
     sale_order_obj = self.pool.get('sale.order')
     so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    sol = so.order_line[0]    
-    self.make_invoices(cr, uid, [ref("sale_order_line_make_invoice_0")], {"lang":
-      'en_US', "active_model": "sale.order.line", "active_ids": [ref(sol.id)], "tz":
-      False, "active_id": ref(sol.id), })
+    sol = so.order_line[0] 
+    self.create_sale_order_line_invoice(cr, uid, [sol.id], {"lang": "en_US",
+      "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale.menu_invoicing_sales_order_lines")],
+      "search_default_uninvoiced": 1, "active_id": ref("sale.menu_invoicing_sales_order_lines"),
+      })
 -
-  I verify that invoice regarding sale order line has been created.
+  I verify that "Invoiced" has been set to True.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so3"))
+    sol = sale_id.order_line[0]  
+    assert(sol.invoiced == True), "Invoiced has not been set to true"
+-
+  I verify that an invoice for sale order line has been created.
 -
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so3"))
-    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so3"
+-
+  I click on the Create button of invoice
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+-
+  I verify that an invoice state has transit from draft to open state
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
+    invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')])
+    assert invoice_id, "Invoice is not in the open state"
+-
+  Creating an account invoice pay entry.
+- 
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
+    amount: 20000.0
+    date: '2010-07-12'
+    journal_id: sale.account_journal_bankjournal0
+    name: test
+    period_id: account.period_5
+- 
+  I pay the invoice.
+-
+  !python {model: account.invoice.pay}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
+    self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "active_model": "account.invoice", 
+      "tz":False,"record_id": so.invoice_ids[0].id, "active_ids": [so.invoice_ids[0].id], "type":
+      "out_invoice", "active_id": so.invoice_ids[0].id})
+-
+  Creating an account invoice pay writeoff entry.
+- 
+  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
+    analytic_id: account.analytic_customers
+    comment: Write-Off
+    writeoff_acc_id: account.a_sale
+    writeoff_journal_id: sale.account_journal_bankjournal0
+- 
+  Pay and Reconcile the Invoice.
+- 
+  !python {model: account.invoice.pay.writeoff}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))   
+    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
+      {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+      [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
+-
+  I verify that an invoice is in done state. 
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
+    invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')])
+    assert invoice_id, "Invoice for SO is not in done state."
+-
+  I verify that Paid has been set to true.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so3"))
+    assert(sale_id.invoiced == True), "Paid has not been set to true"
+-
+ I click on the "Create Invoice" button of sale order and verify that it gives a warning message
+-
+  !python {model: sale.order}: |
+    sale_order_obj = self.pool.get('sale.order')
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    try:
+      wf_service.trg_validate(uid, 'sale.order',ref("sale_order_so3"),'manual_invoice', cr)
+    except:
+       pass
+-
+  I create an invoice for another sale order line. 
+-
+  I click on the "Create Invoice" button of sale order line
+- 
+  !python {model: sale.order.line}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
+    sol = so.order_line[1]    
+    self.create_sale_order_line_invoice(cr, uid, [sol.id], {"lang": "en_US",
+      "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale.menu_invoicing_sales_order_lines")],
+      "search_default_uninvoiced": 1, "active_id": ref("sale.menu_invoicing_sales_order_lines"),
+      })
+-
+  I verify that invoice for sale order line has been created.
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so3"))
+    assert so.invoice_ids[1], "Invoices has not been generated for sale_order_so3"
+-
+  I verify that "Invoiced" has been set to True.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so3"))
+    sol = sale_id.order_line[1]  
+    assert(sol.invoiced == True), "Invoiced has not been set to true"
+-
+  I verify that "Paid" has been set to False.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so3"))
+    assert(sale_id.invoiced == False), "Paid has not been set to true"
+-
+  I open the Invoice for the SO.
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+-
+  I verify that an invoice state has transit from draft to open state
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
+    invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')])
+    assert invoice_id, "Invoice is not in the open state"
+-
+  Creating a account invoice pay entry.
+- 
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
+    amount: 17000.0
+    date: '2010-07-12'
+    journal_id: sale.account_journal_bankjournal0
+    name: test
+    period_id: account.period_5
+- 
+  I pay the invoice.
+-
+  !python {model: account.invoice.pay}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
+    self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "active_model": "account.invoice", 
+      "tz":False,"record_id": so.invoice_ids[1].id, "active_ids": [so.invoice_ids[1].id], "type":
+      "out_invoice", "active_id": so.invoice_ids[1].id})
+-
+  Creating an account invoice pay writeoff entry.
+- 
+  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_1}:
+    analytic_id: account.analytic_customers
+    comment: Write-Off
+    writeoff_acc_id: account.a_sale
+    writeoff_journal_id: sale.account_journal_bankjournal0
+- 
+  Pay and Reconcile the Invoice.
+- 
+  !python {model: account.invoice.pay.writeoff}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))   
+    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_1")],
+      {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+      [so.invoice_ids[1].id], "type": "out_invoice", "active_id": so.invoice_ids[1].id})
+-
+  I verify the invoice is in done state. 
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
+    invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')])
+    assert invoice_id, "Invoice for SO is not in done state."
+-
+  I verify that Paid has been set to true.
+-
+  !python {model: sale.order}: |
+    sale_id=self.browse(cr, uid, ref("sale_order_so3"))
+    assert(sale_id.invoiced == True), "Paid has not been set to true"
\ No newline at end of file
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index b3f121b8c40..37239aedd38 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -26,14 +26,14 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
-        <act_window name="Make Invoices"            
-            res_model="sale.make.invoice"
-            src_model="sale.order"
-            view_mode="form"
-            target="new"        
-            key2="client_action_multi"    
-            id="action_view_sale_order_make_invoice"/>        
+
+<!--        <act_window name="Make Invoices"-->
+<!--            res_model="sale.make.invoice"-->
+<!--            src_model="sale.order"-->
+<!--            view_mode="form"-->
+<!--            target="new"-->
+<!--            key2="client_action_multi"-->
+<!--            id="action_view_sale_order_make_invoice"/>-->
 
     </data>
 </openerp>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 19c23eca13f..3b966e014e6 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -79,7 +79,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                 })
                 create_ids.append(line_id)
                 inv = {
-                    'name': sale.name,
+                    'name': sale.client_order_ref or sale.name,
                     'origin': sale.name,
                     'type': 'out_invoice',
                     'reference': False,
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index a4f48554166..be74ac94ac9 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -20,6 +20,14 @@
             </field>
         </record>
 
+        <record id="action_view_sale_advance_payment_inv" model="ir.actions.act_window">
+            <field name="name">Deposit</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.advance.payment.inv</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
         <record id="view_sale_open_invoice" model="ir.ui.view">
             <field name="name">Open Invoice</field>
@@ -31,7 +39,7 @@
                   <newline />
                  <separator string="" colspan="4"/>
                  <group colspan="4">
-                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                  <button special="cancel" string="Close" icon="gtk-cancel"/>
                    <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
                    </group>
              </form>
diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py
index c3e803fd4f6..0394816f4eb 100644
--- a/addons/sale_analytic_plans/__openerp__.py
+++ b/addons/sale_analytic_plans/__openerp__.py
@@ -27,7 +27,7 @@
     'description': """
     The base module to manage analytic distribution and sales orders.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['sale', 'account_analytic_plans'],
     'init_xml': [],
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 007711da5d0..4b8baa1654e 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -34,7 +34,7 @@ The case is then closed and linked to the generated sale order.
 We suggest you to install this module if you installed both the sale and the
 crm modules.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['sale', 'crm'],
     'init_xml': [],
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 4ded6620847..4d393b22435 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -37,7 +37,7 @@
 	                    <filter icon="terp-personal+"
 	                            domain="[('section_id.user_id','=',uid)]"
 	                            groups="base.group_extended"
-	                            help="My Sales Team"/>
+	                            help="My Sales Team(s)"/>
 	                </field>
 	            </field>
 	        </field>
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 683d050b454..371d206e4f7 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -21,7 +21,6 @@
 
 from osv import fields, osv
 from tools.translate import _
-from mx.DateTime import now
 import time
 import decimal_precision as dp
 
@@ -100,7 +99,7 @@ class crm_make_sale(osv.osv_memory):
                     raise osv.except_osv(_('Data Insufficient!'),_('Customer has no addresses defined!'))
     
                 vals = {
-                    'origin': 'Opportunity:%s' % str(case.id),
+                    'origin': 'Opportunity: %s' % str(case.id),
                     'section_id': case.section_id and case.section_id.id or False,
                     'shop_id': make.shop_id.id,
                     'partner_id': partner_id,
@@ -108,8 +107,7 @@ class crm_make_sale(osv.osv_memory):
                     'partner_invoice_id': partner_addr['invoice'],
                     'partner_order_id': partner_addr['contact'],
                     'partner_shipping_id': partner_addr['delivery'],
-                    'order_policy': 'manual',
-                    'date_order': now(),
+                    'date_order': time.strftime('%Y-%m-%d'),
                     'fiscal_position': fpos,
                 }
     
@@ -121,14 +119,21 @@ class crm_make_sale(osv.osv_memory):
                     vals['project_id'] = make.analytic_account.id
                 new_id = sale_obj.create(cr, uid, vals)
                 for line in make.sale_order_line:
-                    value = sale_line_obj.product_id_change(cr, uid, [], pricelist,
-                            line.product_id.id, qty=1, partner_id=partner_id, fiscal_position=fpos)['value']
-                    value['product_id'] =line.product_id.id
+                    value = {}
                     value['order_id'] = new_id
-                    value['tax_id'] = [(6,0,line['tax_id'])]
+                    value['name'] = line.name
+                    value['delay'] = line.delay
+                    value['product_id'] =line.product_id and line.product_id.id or False
+                    value['price_unit'] = line.price_unit
+                    value['tax_id'] = line.tax_id and [(6,0,map(lambda x: x.id,line.tax_id))] or False
+                    value['type'] = line.type
                     value['product_uom_qty']=line.product_uom_qty
-                    value['discount']=line.discount
                     value['product_uom']=line.product_uom.id
+                    value['product_uos_qty']=line.product_uos_qty
+                    value['product_uos']=line.product_uos and line.product_uos.id or False
+                    value['product_packaging'] = line.product_packaging and line.product_packaging.id or False
+                    value['discount']=line.discount
+                    value['notes']=line.notes
                     sale_line_obj.create(cr, uid, value)
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
@@ -149,7 +154,6 @@ class crm_make_sale(osv.osv_memory):
                     'view_id': False,
                     'type': 'ir.actions.act_window',
                     'res_id': new_ids and new_ids[0]
-
                 }
             else:
                 value = {
@@ -165,8 +169,8 @@ class crm_make_sale(osv.osv_memory):
 
     _columns = {
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
-        'partner_id': fields.many2one('res.partner', 'Customer', required=True, help='Use this partner if there is no partner on the Opportunity'),
-        'sale_order_line': fields.one2many('sale.order.make.line', 'order_line', 'Product Line', readonly=True, states={'draft': [('readonly', False)]}),
+        'partner_id': fields.many2one('res.partner', 'Customer', required=True),
+        'sale_order_line': fields.one2many('sale.order.make.line', 'opportunity_order_id', 'Product Line'),
         'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'),   
         'close': fields.boolean('Close Case', help='Check this to close the case after having created the sale order.'),              
     }
@@ -180,140 +184,33 @@ crm_make_sale()
 
 class sale_order_make_line(osv.osv_memory):
    
-
-    def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
+    def product_id_change(self, cr, uid, ids, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
-            lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False):
+            lang=False, update_tax=True, packaging=False, flag=False):
         if not  partner_id:
             raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
-        warning = {}
-        product_uom_obj = self.pool.get('product.uom')
-        partner_obj = self.pool.get('res.partner')
-        product_obj = self.pool.get('product.product')
-        if partner_id:
-            lang = partner_obj.browse(cr, uid, partner_id).lang
-        context = {'lang': lang, 'partner_id': partner_id}
-
-        if not product:
-            return {'value': {'th_weight': 0, 'product_packaging': False,
-                'product_uos_qty': qty}, 'domain': {'product_uom': [],
-                   'product_uos': []}}
-
-        if not date_order:
-            date_order = time.strftime('%Y-%m-%d')
-
-        result = {}
-        product_obj = product_obj.browse(cr, uid, product, context=context)
-        if not packaging and product_obj.packaging:
-            packaging = product_obj.packaging[0].id
-            result['product_packaging'] = packaging
-
-        if packaging:
-            default_uom = product_obj.uom_id and product_obj.uom_id.id
-            pack = self.pool.get('product.packaging').browse(cr, uid, packaging, context=context)
-            q = product_uom_obj._compute_qty(cr, uid, uom, pack.qty, default_uom)
-#            qty = qty - qty % q + q
-            if qty and (q and not (qty % q) == 0):
-                ean = pack.ean
-                qty_pack = pack.qty
-                type_ul = pack.ul
-                warn_msg = _("You selected a quantity of %d Units.\nBut it's not compatible with the selected packaging.\nHere is a proposition of quantities according to the packaging: ") % (qty)
-                warn_msg = warn_msg + "\n\n" + _("EAN: ") + str(ean) + _(" Quantity: ") + str(qty_pack) + _(" Type of ul: ") + str(type_ul.name)
-                warning = {
-                    'title': _('Picking Information !'),
-                    'message': warn_msg
-                    }
-            result['product_uom_qty'] = qty
-
-        uom2 = False
-        if uom:
-            uom2 = product_uom_obj.browse(cr, uid, uom)
-            if product_obj.uom_id.category_id.id != uom2.category_id.id:
-                uom = False
-
-        if uos:
-            if product_obj.uos_id:
-                uos2 = product_uom_obj.browse(cr, uid, uos)
-                if product_obj.uos_id.category_id.id != uos2.category_id.id:
-                    uos = False
-            else:
-                uos = False
-        if product_obj.description_sale:
-            result['notes'] = product_obj.description_sale
-        fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
-        if update_tax: #The quantity only have changed
-            result['delay'] = (product_obj.sale_delay or 0.0)
-            partner = partner_obj.browse(cr, uid, partner_id)
-            result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
-            result.update({'type': product_obj.procure_method})
-
-        if not flag:
-            result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context)[0][1]
-        domain = {}
-        if (not uom) and (not uos):
-            result['product_uom'] = product_obj.uom_id.id
-            if product_obj.uos_id:
-                result['product_uos'] = product_obj.uos_id.id
-                result['product_uos_qty'] = qty * product_obj.uos_coeff
-                uos_category_id = product_obj.uos_id.category_id.id
-            else:
-                result['product_uos'] = False
-                result['product_uos_qty'] = qty
-                uos_category_id = False
-            domain = {'product_uom':
-                        [('category_id', '=', product_obj.uom_id.category_id.id)],
-                        'product_uos':
-                        [('category_id', '=', uos_category_id)]}
-
-        elif uos and not uom: # only happens if uom is False
-            result['product_uom'] = product_obj.uom_id and product_obj.uom_id.id
-            result['product_uom_qty'] = qty_uos / product_obj.uos_coeff
-        elif uom: # whether uos is set or not
-            default_uom = product_obj.uom_id and product_obj.uom_id.id
-            q = product_uom_obj._compute_qty(cr, uid, uom, qty, default_uom)
-            if product_obj.uos_id:
-                result['product_uos'] = product_obj.uos_id.id
-                result['product_uos_qty'] = qty * product_obj.uos_coeff
-            else:
-                result['product_uos'] = False
-                result['product_uos_qty'] = qty
-
-        if not uom2:
-            uom2 = product_obj.uom_id
-        return {'value': result, 'domain': domain, 'warning': warning}
+        date_order = time.strftime('%Y-%m-%d') 
+        part = self.pool.get('res.partner').browse(cr, uid, partner_id)
+        pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
+        fiscal_position = part.property_account_position and part.property_account_position.id or False
+        return self.pool.get('sale.order.line').product_id_change(cr, uid, ids, pricelist, product, qty, uom, qty_uos, uos, name, partner_id, lang, update_tax, date_order, packaging, fiscal_position, flag)
     
-    def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
-            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
-            lang=False, update_tax=True, date_order=False):
-        res = self.product_id_change(cursor, user, ids, pricelist, product,
-                qty=qty, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
-                partner_id=partner_id, lang=lang, update_tax=update_tax,
-                date_order=date_order)
-        if 'product_uom' in res['value']:
-            del res['value']['product_uom']
-        if not uom:
-            res['value']['price_unit'] = 0.0
-        return res    
-
     _name = 'sale.order.make.line'
-    _description = 'Sale Order Line'
+    _description = 'Opportunity Sale Order Line'
     _columns = {
-        'order_line': fields.many2one('crm.make.sale', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, ),
-        'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, ),
-        'name': fields.char('Description', size=256, required=True, select=True, readonly=True, ),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sale order lines."),
-        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer", readonly=True, ),
+        'opportunity_order_id': fields.many2one('crm.make.sale', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, ),
+        'name': fields.char('Description', size=256, required=True, select=True, ),
+        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer"),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
-        'procurement_id': fields.many2one('procurement.order', 'Procurement'),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, ),
-        'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}),
-        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_uos_qty': fields.float('Quantity (UoS)', readonly=True, states={'draft':[('readonly',False)]}),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')),
+        'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes'),
+        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True),
+        'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, ),
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, ),
+        'product_uos_qty': fields.float('Quantity (UoS)'),
         'product_uos': fields.many2one('product.uom', 'Product UoS'),
         'product_packaging': fields.many2one('product.packaging', 'Packaging'),
-        'discount': fields.float('Discount (%)', digits=(16, 2), readonly=True, states={'draft':[('readonly',False)]}),
+        'discount': fields.float('Discount (%)', digits=(16, 2)),
         'notes': fields.text('Notes'),
     }
     _order = 'sequence, id'
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index 17e743987f0..ac1ef80e011 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -21,25 +21,19 @@
                                     <notebook>
                                         <page string="Order Line">
                                             <field colspan="4"
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+                                                context="partner_id=parent.partner_id,shop=parent.shop_id"
                                                 name="product_id"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position, False)"
+                                                on_change="product_id_change(product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, product_packaging, False)"
                                                 />
-                                            <field
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-                                                name="product_uom_qty"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
-                                                />
-                                                <field groups="product.group_uos" name="product_uos_qty"/>
-                                            <field name="product_uom"
-                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
+                                               <field name="product_uom_qty"/>
+                                               <field name="product_uom"/>
+                                            <group colspan="2" groups="product.group_uos">
+                                               <field name="product_uos_qty"/>
+                                               <field name="product_uos" nolabel="1"/></group>
                                             <field
                                                 name="product_packaging"
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, False)"
                                                 domain="[('product_id','=',product_id)]"
                                                 groups="base.group_extended"/>
-
                                             <field colspan="4" name="name"/>
                                             <field name="price_unit"/>
                                             <field name="discount"/>
@@ -49,6 +43,9 @@
                                             <separator colspan="5" string="Taxes"/>
                                             <field colspan="4" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                         </page>
+                                        <page string="Notes">
+                                            <field colspan="4" name="notes" nolabel="1"/>
+                                        </page>
                                     </notebook>
                                 </form>
                                 <tree string="Sales order lines">
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 80643eb5d4d..8453b24b05a 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -46,7 +46,7 @@
 
     Some statistics by journals are provided.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['sale'],
     'init_xml': ['sale_journal_data.xml'],
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index cbdb3e84fd0..fdcc70f710a 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -1,6 +1,9 @@
 <openerp>
    <data>
 
+        <menuitem id="menu_sale_journal_config" name="Sale Journals"
+            parent="base.menu_base_config" sequence="5"/>
+
    <!--  sale journal invoice Type's Form  view -->
 
         <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
@@ -40,7 +43,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-    <!-- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/> -->
+     <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="menu_sale_journal_config" action="action_definition_journal_invoice_type"/> 
 
     <!-- sale journal Form view  -->
 
@@ -138,7 +141,8 @@
             <field name="search_view_id" ref="view_sale_journal_search"/>
         </record>
 
-        <menuitem id="menu_definition_journal" name="Sales Journals" parent="product.prod_config_main"  action="action_definition_journal" sequence="70" />
+
+        <menuitem id="menu_definition_journal" name="Sales Journals" parent="menu_sale_journal_config"  action="action_definition_journal" sequence="70" />
 
     <!-- Inherit sales order form view -->
 
@@ -151,7 +155,7 @@
                 <field name="origin" position="after">
                 	<group colspan="2" col="2">
 	                    <separator string="Journal" colspan="4"/>
-	                    <field name="journal_id" select="1" widget="selection"/>
+	                    <field name="journal_id" select="1"/>
 	                    <field name="invoice_type_id" select="1" widget="selection"/>
                     </group>
                 </field>
@@ -476,7 +480,7 @@
         </record>
 
 
-        <record id="view_sale_journal_search_form" model="ir.ui.view">
+        <!--record id="view_sale_journal_search_form" model="ir.ui.view">
             <field name="name">sale.order.journal.search</field>
             <field name="model">sale.order</field>
             <field name="type">search</field>
@@ -487,7 +491,7 @@
                     <separator orientation="vertical"/>
                 </xpath>
             </field>
-        </record>
+        </record-->
 
         
         <record id="view_picking_delivery_jorunal_search_form" model="ir.ui.view">
diff --git a/addons/profile_manufacturing/__init__.py b/addons/sale_layout/__init__.py
old mode 100644
new mode 100755
similarity index 89%
rename from addons/profile_manufacturing/__init__.py
rename to addons/sale_layout/__init__.py
index d9a31f5fb06..e0a5a2b9f9c
--- a/addons/profile_manufacturing/__init__.py
+++ b/addons/sale_layout/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -18,7 +17,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import profile_manufacturing
+
+import sale_layout
+import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
new file mode 100755
index 00000000000..b4c647627ba
--- /dev/null
+++ b/addons/sale_layout/__openerp__.py
@@ -0,0 +1,48 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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" : "Sale Order Layout Improvement",
+    "version" : "1.0",
+    "depends" : ["base", "sale"],
+    "author" : "OpenERP SA",
+    "description": """
+    This module provides some features to improve the layout of the Sale Order.
+
+    It gives you the possibility to
+        * order all the lines of an sale order
+        * add titles, comment lines, sub total lines
+        * draw horizontal lines and put page breaks    
+
+    """,
+    "website" : "http://www.openerp.com",
+    "category" : "Generic Modules/Sales & Purchases",
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [
+#        "security/ir.model.access.csv",
+        "sale_layout_view.xml",
+        "sale_layout_report.xml",
+    ],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_layout/i18n/fr.po b/addons/sale_layout/i18n/fr.po
new file mode 100755
index 00000000000..8786f6edb7d
--- /dev/null
+++ b/addons/sale_layout/i18n/fr.po
@@ -0,0 +1,290 @@
+# 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: 2009-11-26 08:45+0000\n"
+"PO-Revision-Date: 2010-07-29 08:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-07-30 03:37+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Sous-total"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Titre"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "sale_layout"
+msgstr "sale_layout"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Remarque"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Lignes de commande"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Mise en page"
+
+#. module: sale_layout
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Seq."
+msgstr "Séq."
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Produit"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid ""
+"\n"
+"    This module provides some features to improve the layout of the Sale "
+"Order.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of an sale order\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks    \n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Ce module ajoute des options pour améliorer la mise en page des "
+"commandes de vente.\n"
+"\n"
+"    Il vous permet :\n"
+"        * de réordonner toutes les lignes d'une commande\n"
+"        * d'ajouter des titres, des lignes de remarques, des sous-totaux\n"
+"        * de tracer des lignes horizontales et de faire des sauts de page    "
+"\n"
+"\n"
+"    "
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Description"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr "Description manuelle"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Our Salesman"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Déclaration automatique"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Lignes de facture"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Créer facture"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Propriétés"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Saut de page"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Notes"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Payment Terms"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Historique"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Lignes de commande"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Ligne de séparation"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Lignes de commande"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Qté"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "États"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Commande avec mise en page"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Info supplémentaires"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "UDM"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Commande client"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Price"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Mouvements de stocks"
diff --git a/addons/sale_layout/i18n/fr_BE.po b/addons/sale_layout/i18n/fr_BE.po
new file mode 100755
index 00000000000..6a44937a3d3
--- /dev/null
+++ b/addons/sale_layout/i18n/fr_BE.po
@@ -0,0 +1,276 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_layout
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 08:45:52+0000\n"
+"PO-Revision-Date: 2009-11-26 08:45: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: \n"
+"Plural-Forms: \n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "sale_layout"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Seq."
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid "\n"
+"    This module provides some features to improve the layout of the Sale Order.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of an sale order\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks    \n"
+"\n"
+"    "
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Description"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Our Salesman"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Payment Terms"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Price"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr ""
+
diff --git a/addons/sale_layout/i18n/fr_FR.po b/addons/sale_layout/i18n/fr_FR.po
new file mode 100755
index 00000000000..349a32e2c84
--- /dev/null
+++ b/addons/sale_layout/i18n/fr_FR.po
@@ -0,0 +1,179 @@
+# translation of fr_FR.po to Français
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_layout
+#
+# Numerigraphe <informatique@numerigraphe.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr_FR\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-03-25 10:13:19+0000\n"
+"PO-Revision-Date: 2009-03-25 11:25+0100\n"
+"Last-Translator: Numerigraphe <informatique@numerigraphe.com>\n"
+"Language-Team: Français\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Sous-total"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Titre"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Lignes de commande"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Lignes de commande"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_name_translation
+msgid ""
+"\n"
+"    This module provides some features to improve the layout of the Sale Order.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of an sale order\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks    \n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Ce module ajoute des options pour améliorer la mise en page des commandes de vente.\n"
+"\n"
+"    Il vous permet :\n"
+"        * de réordonner toutes les lignes d'une commande\n"
+"        * d'ajouter des titres, des lignes de remarques, des sous-totaux\n"
+"        * de tracer des lignes horizontales et de faire des sauts de page    \n"
+"\n"
+"    "
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Mise en page"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Produit"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr "Description manuelle"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Déclaration automatique"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Lignes de facture"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Créer facture"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Propriétés"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "UDM"
+
+#. module: sale_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue"
+
+#. module: sale_layout
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Seq."
+msgstr "Séq."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Notes"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Historique"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Remarque"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Ligne de séparation"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Lignes de commande"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Qté"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "États"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Commande avec mise en page"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Info supplémentaires"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Saut de page"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Commande client"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_name_translation
+msgid "sale_layout"
+msgstr "sale_layout"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Mouvements de stocks"
+
diff --git a/addons/sale_layout/i18n/sale_layout.pot b/addons/sale_layout/i18n/sale_layout.pot
new file mode 100755
index 00000000000..6a44937a3d3
--- /dev/null
+++ b/addons/sale_layout/i18n/sale_layout.pot
@@ -0,0 +1,276 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_layout
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 08:45:52+0000\n"
+"PO-Revision-Date: 2009-11-26 08:45: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: \n"
+"Plural-Forms: \n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "sale_layout"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Seq."
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid "\n"
+"    This module provides some features to improve the layout of the Sale Order.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of an sale order\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks    \n"
+"\n"
+"    "
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Description"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Our Salesman"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Payment Terms"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Price"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr ""
+
diff --git a/addons/profile_manufacturing/__openerp__.py b/addons/sale_layout/report/__init__.py
old mode 100644
new mode 100755
similarity index 63%
rename from addons/profile_manufacturing/__openerp__.py
rename to addons/sale_layout/report/__init__.py
index f9c45b7260e..21b30a51454
--- a/addons/profile_manufacturing/__openerp__.py
+++ b/addons/sale_layout/report/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,18 +18,7 @@
 #
 ##############################################################################
 
+import report_sale_layout
 
-{
-    'name': 'Manufacturing industry profile',
-    'version': '1.0',
-    'category': 'Profile',
-    'description': """Profile for manufacturing industries""",
-    'author': 'Tiny',
-    'depends': ['mrp', 'sale', 'delivery', 'board_manufacturing', 'product_margin', 'sale_delivery_report'],
-    'update_xml': ['security/ir.model.access.csv', 'profile_manufacturing.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-    'certificate': '0027737506213',
-}
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_layout/report/order.rml b/addons/sale_layout/report/order.rml
new file mode 100755
index 00000000000..8c7cfaa0d2d
--- /dev/null
+++ b/addons/sale_layout/report/order.rml
@@ -0,0 +1,378 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="AddressTable">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="OrderTable">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="HeadingTable">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Order_Desc_Table">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Total_Table">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
+    </blockTableStyle>
+    <blockTableStyle id="Partner_Note_Table">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Preformatted Text" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <blockTable colWidths="265.0,51.0,225.0" style="AddressTable">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Shipping address :</para>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.title or '' ]][[ o.partner_shipping_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.street2 or ''  ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]]  [[ o.partner_shipping_id.zip or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]][[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_Bold_9">Invoice address :</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.street ]][[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.city or ''  ]]  [[ o.partner_invoice_id.zip or ''  ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.country_id and ('%s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.partner_id.title or ''  ]][[  o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.title or '' ]][[ o.partner_order_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.street2 or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.city or '' ]]  [[ o.partner_order_id.zip or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]][[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ o.partner_order_id.fax or removeParentNode('para')  ]]</para>
+          <para style="terp_default_9">TVA : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
+    <para style="terp_header">[[ o.state=='draft' and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Your Reference </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Date Ordered </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Our Salesman </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Payment Terms</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="132.0,134.0,135.0,135.0" style="OrderTable">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.date_order ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.user_id.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.payment_term.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="208.0,99.0,64.0,59.0,43.0,65.0" repeatRows="1" style="HeadingTable">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">VAT</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>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(o.order_line,'line') ]]</para>
+      <blockTable colWidths="207.0,99.0,43.0,21.0,59.0,43.0,65.0" style="Order_Desc_Table">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ ', '.join(map(lambda x: x.name, line.tax_id)) or '0.00' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line.product_uos and line.product_uos_qty or line.product_uom_qty  or '0.00']]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line.price_unit or '0.00' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line.discount and str(line.discount) or '0.00' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line.price_subtotal or '0.00' ]]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="P7">[[ format(line.notes or removeParentNode('tr')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="384.0,67.0,64.0,22.0" style="Total_Table">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P6">Net Total :</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.amount_untaxed or '0.00' ]]</para>
+        </td>
+        <td>
+          <para style="P2">[[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">Taxes :</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.amount_tax or '0.00' ]]</para>
+        </td>
+        <td>
+          <para style="P2">[[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">Total :</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ o.amount_total or  '0.00' ]] </para>
+        </td>
+        <td>
+          <para style="P3">[[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="533.0" style="Partner_Note_Table">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format(o.note or '') ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py
new file mode 100755
index 00000000000..20ad66313a2
--- /dev/null
+++ b/addons/sale_layout/report/report_sale_layout.py
@@ -0,0 +1,140 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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 time
+import pooler
+from report import report_sxw
+
+
+rml_parents = {
+    'tr':1,
+    'li':1,
+    'story': 0,
+    'section': 0
+}
+class sale_order_1(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(sale_order_1, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'sale_order_lines': self.sale_order_lines,
+          #  'repeat_In':self.repeat_In,
+        })
+        self.context = context
+
+#
+
+    def sale_order_lines(self,sale_order):
+        result =[]
+        sub_total={}
+        info=[]
+        order_lines=[]
+        res={}
+        list_in_seq=[]
+        ids = self.pool.get('sale.order.line').search(self.cr, self.uid, [('order_id', '=', sale_order.id)])
+        for id in range(0,len(ids)):
+            order = self.pool.get('sale.order.line').browse(self.cr, self.uid,ids[id], self.context.copy())
+            order_lines.append(order)
+        
+        i=1
+        j=0
+        sum_flag={}
+        sum_flag[j]=-1
+        for entry in order_lines:
+            res={}
+
+            if entry.layout_type=='article':
+                res['tax_id']=', '.join(map(lambda x: x.name, entry.tax_id)) or ''
+                res['name']=entry.name
+                res['product_uom_qty']="%.2f"%(entry.product_uos and entry.product_uos_qty or entry.product_uom_qty  or 0.00)
+                res['product_uom']=entry.product_uos and entry.product_uos.name or entry.product_uom.name 
+                res['price_unit']="%.2f"%(entry.price_unit or 0.00)
+                res['discount']="%.2f"%(entry.discount and entry.discount or 0.00)
+                res['price_subtotal']="%.2f"%(entry.price_subtotal and  entry.price_subtotal or 0.00)
+                sub_total[i]= entry.price_subtotal and  entry.price_subtotal 
+                i=i+1
+                res['note']=entry.notes or ''
+                res['currency']=sale_order.pricelist_id.currency_id.name
+                res['layout_type']=entry.layout_type
+                
+            else:
+
+                res['product_uom_qty']=''
+                res['price_unit']=''
+                res['discount']=''
+                res['tax_id']=''
+                res['layout_type']=entry.layout_type
+                res['note']=entry.notes or ''
+                res['product_uom']=''
+
+                if entry.layout_type=='subtotal':
+                    res['name']=entry.name
+                    sum=0
+                    sum_id=0
+                    if sum_flag[j]==-1:
+                        temp=1
+                    else:
+                        temp=sum_flag[j]
+
+                    for sum_id in range(temp,len(sub_total)+1):
+                        sum+=sub_total[sum_id]
+                    sum_flag[j+1]= sum_id +1
+
+                    j=j+1
+                    res['price_subtotal']="%.2f"%(sum)
+                    res['currency']=sale_order.pricelist_id.currency_id.name
+                    res['quantity']=''
+                    res['price_unit']=''
+                    res['discount']=''
+                    res['tax_id']=''
+                    res['product_uom']=''
+                elif entry.layout_type=='title':
+                    res['name']=entry.name
+                    res['price_subtotal']=''
+                    res['currency']=''
+                elif entry.layout_type=='text':
+                    res['name']=entry.name
+                    res['price_subtotal']=''
+                    res['currency']=''
+                elif entry.layout_type=='line':
+                    res['product_uom_qty']='__________'
+                    res['price_unit']='______________'
+                    res['discount']='___________'
+                    res['tax_id']='_________________'
+                    res['product_uom']='_____'
+                    res['name']='_______________________________________'
+                    res['price_subtotal']='_________'
+                    res['currency']='_______'
+                elif entry.layout_type=='break':
+                    res['layout_type']=entry.layout_type
+                    res['name']=entry.name
+                    res['price_subtotal']=''
+                    res['currency']=''
+                else:
+                    res['name']=entry.name
+                    res['price_subtotal']=''
+                    res['currency']=sale_order.pricelist_id.currency_id.name
+
+            result.append(res)
+        return result
+report_sxw.report_sxw('report.sale.order.layout', 'sale.order', 'addons/sale_layout/report/report_sale_layout.rml', parser=sale_order_1)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
new file mode 100755
index 00000000000..fe2f15ebf42
--- /dev/null
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -0,0 +1,437 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_final">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_note">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+
+
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="20.0" leading="25" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Helvetica-BoldOblique" fontSize="20.0" leading="25" alignment="LEFT"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="11.0" leading="14"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT"/>
+    <paraStyle name="P14" fontName="Helvetica-BoldOblique" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P17" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P18" fontName="Helvetica-BoldOblique" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P19" fontName="Helvetica-BoldOblique" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P20" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P21" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P22" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P23" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P24" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P25" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P26" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P27" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P28" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P29" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P30" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P31" fontName="Helvetica-Bold" fontSize="9.0" leading="13" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P32" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P33" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P34" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
+    <para style="P14">[[ setLang(o.partner_id.lang) ]]</para>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="254.0,62.0,211.0" style="Tableau2">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Shipping address :</para>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.street2 or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]] [[ o.partner_shipping_id.zip or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]] [[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_Bold_9">Invoice address :</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
+          <para style="P27">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
+        </td>
+        <td>
+          <para style="P17">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.street2 or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]] [[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TVA : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="P26">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
+    <para style="terp_header">[[ o.state=='draft' and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
+    <para style="P15">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table5">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Your Reference </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Date Ordered </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Our Salesman </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Payment Terms</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table6">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.client_order_ref ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.date_order ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.user_id.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.payment_term.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">VAT</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>
+ 
+	<section>
+      <para style="P32">[[ repeatIn(sale_order_lines(o),'a') ]]</para>
+		<blockTable colWidths="0.0,216.0,66,46,24,66,55,54" style="Table1">
+			<tr>
+			<td>
+			<para style="P8">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</para>
+			</td>
+			<td>
+			<para style="Table Contents"><font>[[ (a['layout_type']=='title' or a['layout_type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para>
+			</td>
+			<td>
+			<para style="Table Contents"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font')  ]]</font><font>[[ a['tax_id'] ]]</font></para>
+			</td>
+			<td>
+			<para style="Table Contents"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['product_uom_qty'] ]]</font></para>
+			</td>
+			<td>
+			<para style="Table Contents"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['product_uom'] ]]</font></para>
+			</td>
+			<td>
+			<para style="Table Contents"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] </font><font>[[ a['price_unit'] ]]</font></para>
+			</td>
+			<td>
+			<para style="Table Contents"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['discount'] ]]</font></para>
+			</td>
+			<td>
+			<para style="Table Contents"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font')  ]]</font><font>[[ a['price_subtotal'] ]]</font></para>
+			</td>
+			</tr>
+			</blockTable>
+    <blockTable colWidths="453.0,74.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P7">[[ a['layout_type']=='text' and a['name'] or removeParentNode('blockTable') ]]</para>
+        </td>
+        <td>
+          <para style="P7"></para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="66.0,461.0" style="Table3">
+      <tr>
+        <td>
+        	
+          <para style="P7"><font>[[ a['note']=='' and removeParentNode('blockTable') ]]</font><font>[[ repeatIn(( a['note'] and a['note'].splitlines()) or [], 'note') ]]</font></para>
+        </td>
+        <td>
+          <para style="P7">[[ a['note'] and  note or removeParentNode('blockTable') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+			<pageBreak>[[ a['layout_type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
+    	<blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P31">Description [[ a['layout_type']!='break' and removeParentNode('blockTable')]]</para>
+        </td>
+        <td>
+          <para style="P31">Taxes</para>
+        </td>
+        <td>
+          <para style="P31">Quantity</para>
+        </td>
+        <td>
+          <para style="P31">Unit Price</para>
+        </td>
+        <td>
+          <para style="P31">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="P31">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    </section>
+   <blockTable colWidths="387.0,56.0,73.0,21.0" style="Table_final">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">Net Total :</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">Taxes :</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax ) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Total :</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="533.0" style="Table_note">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format(o.note or '') ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+  </story>
+</document>
diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py
new file mode 100755
index 00000000000..d493b7d6840
--- /dev/null
+++ b/addons/sale_layout/sale_layout.py
@@ -0,0 +1,160 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields,osv
+from tools import config
+import decimal_precision as dp
+from tools.translate import _
+class sale_order_line(osv.osv):
+    
+    def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        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={}):
+        new_ids = []
+        list_seq = []
+        for line in self.browse(cr, uid, ids, context):
+            if line.layout_type == 'article':
+                new_ids.append(line.id)
+                list_seq.append(line.sequence)
+        invoice_line_ids = super(sale_order_line, self).invoice_line_create(cr, uid, new_ids, context)
+        pool_inv_line = self.pool.get('account.invoice.line')
+        seq = 0
+        for obj_inv_line in pool_inv_line.browse(cr, uid, invoice_line_ids, context=context):
+            pool_inv_line.write(cr, uid, [obj_inv_line.id], {'sequence': list_seq[seq]}, context=context)
+            seq += 1
+        return invoice_line_ids
+
+    def onchange_sale_order_line_view(self, cr, uid, id, type, context={}, *args):
+            temp ={}
+            temp['value']= {}
+            if (not type):
+                return {}
+            if type != 'article':
+                temp = {'value': {
+                        'product_id': False,
+                        'uos_id': False,
+                        'account_id': False,
+                        'price_unit': 0.0,
+                        'price_subtotal': 0.0,
+                        'quantity': 0,
+                        'discount': 0.0,
+                        'invoice_line_tax_id': False,
+                        'account_analytic_id': False,
+                        'product_uom_qty':0.0,
+                        },
+                    }
+                if type == 'line':
+                    temp['value']['name'] = ' '
+                if type == 'break':
+                    temp['value']['name'] = ' '
+                if type == 'subtotal':
+                    temp['value']['name'] = 'Sub Total'
+                return temp
+            return {}
+
+    def create(self, cr, user, vals, context=None):
+        if vals.has_key('layout_type'):
+            if vals['layout_type'] == 'line':
+                vals['name'] = ' '
+            if vals['layout_type'] == 'break':
+                vals['name'] = ' '
+            if vals['layout_type'] != 'article':
+                vals['product_uom_qty']= 0                
+        return super(sale_order_line, self).create(cr, user, vals, context)
+
+    def write(self, cr, user, ids, vals, context=None):
+        if vals.has_key('layout_type'):
+            if vals['layout_type'] == 'line':
+                vals['name'] = ' '
+            if vals['layout_type'] == 'break':
+                vals['name'] = ' '
+        return super(sale_order_line, self).write(cr, user, ids, vals, context)
+
+    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
+        return super(sale_order_line, self).copy(cr, uid, id, default, context)
+    
+
+    _name = "sale.order.line"
+    _order = "order_id, sequence asc"
+    _description = "Sale Order line"
+    _inherit = "sale.order.line"
+    _columns = {
+        'layout_type': fields.selection([
+                ('article','Product'),
+                ('title','Title'),
+                ('text','Note'),
+                ('subtotal','Sub Total'),
+                ('line','Separator Line'),
+                ('break','Page Break'),]
+            ,'Layout Type', select=True, required=True),
+        'sequence': fields.integer('Sequence Number'), 
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}),
+        'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)),
+        'product_uom': fields.many2one('product.uom', 'Product UoM'),   
+    }   
+
+    _defaults = {
+        'layout_type': lambda *a: 'article',
+    }
+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 = {}
+        for id in ids:
+            res[id] = []
+        ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids),('layout_type','=','article')], limit=self._limit)
+        for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
+            res[r[self._fields_id]].append( r['id'] )
+        return res
+
+
+class sale_order(osv.osv):
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default['order_line'] = False
+        return super(sale_order, self).copy(cr, uid, id, default, context)
+
+    _inherit = "sale.order"
+    _columns = {
+        'abstract_line_ids': fields.one2many('sale.order.line', 'order_id', 'Order Lines',readonly=True, states={'draft':[('readonly',False)]}),
+        'order_line': one2many_mod2('sale.order.line', 'order_id', 'Order Lines',readonly=True, states={'draft':[('readonly',False)]}),
+    }
+sale_order()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_layout/sale_layout_report.xml b/addons/sale_layout/sale_layout_report.xml
new file mode 100755
index 00000000000..53775fdb149
--- /dev/null
+++ b/addons/sale_layout/sale_layout_report.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+	
+	<report id="sale_order_1"
+			string="Order with Layout"
+			model="sale.order"
+			name="sale.order.layout"
+			rml="sale_layout/report/report_sale_layout.rml"
+			auto="False"/>
+	</data>
+</openerp>
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
new file mode 100755
index 00000000000..41ab5d33900
--- /dev/null
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+        <data>
+             <record id="sale.action_order_line_tree2" model="ir.actions.act_window">
+               <field name="domain">[('layout_type','=', 'article')]</field>
+             </record>
+		<record model="ir.ui.view" id="view_order_line_form2_inherit_1">
+			<field name="name">sale.order.line.form2.inherit_1</field>
+			<field name="model">sale.order.line</field>
+			<field name="inherit_id" ref="sale.view_order_line_form2"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<xpath expr="/form/notebook/page/field[@name='name']" position="before">
+					<field name="layout_type" select="1" on_change="onchange_sale_order_line_view(layout_type)" />
+					<field name="sequence"/>
+				</xpath>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_order_form_inherit_1">
+			<field name="name">sale.order.form.inherit_1</field>
+			<field name="model">sale.order</field>
+			<field name="inherit_id" ref="sale.view_order_form"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<xpath expr="/form/notebook/page/field[@name='order_line']" position="replace">
+					<field name="abstract_line_ids" colspan="4" nolabel="1" widget="one2many_list">
+							<form string="Sale Order Lines">
+								<notebook>
+	                                <page string="Order Line">
+										<separator colspan="4" string="Automatic Declaration"/>
+										<field colspan="4"
+					                        context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+					                        name="product_id"
+					                        attrs="{'readonly':[('layout_type','!=','article')]}"
+					                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position)"
+					                        select="1"/>
+					                    <field
+					                        context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+					                        name="product_uom_qty"
+					                        attrs="{'readonly':[('layout_type','!=','article')]}"
+					                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position)"
+					                        select="1"/>
+					                    <field name="product_uom"
+					                  		 required="0"
+					                    	attrs="{'readonly':[('layout_type','!=','article')],  'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
+					                        on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
+					                    <field
+					                        name="product_packaging"
+					                        attrs="{'readonly':[('layout_type','!=','article')]}"
+					                        context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+					                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position)"
+					                        domain="[('product_id','=',product_id)]"
+					                        groups="base.group_extended"/>
+					                    <separator colspan="4" string="Manual Description" />
+					                    <field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
+					                    <field name="sequence" string="Seq."/>
+					                    <field colspan="4" name="name" select="2" attrs="{'readonly':[('layout_type','in',('line','break'))] }"/>
+					                    <field name="price_unit" select="2" attrs="{'readonly':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
+					                    <field name="discount" attrs="{'readonly':[('layout_type','!=','article')]}"/>
+					                    <field name="type" attrs="{'readonly':[('layout_type','!=','article')]}"/>
+					                    <field name="delay" select="2" attrs="{'readonly':[('layout_type','!=','article')]}"/>
+					                    <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" attrs="{'readonly':[('layout_type','!=','article')]}"/>
+					                    <separator colspan="4" string="States"/>
+                                        <field name="state" select="2"/>
+                                        <group col="3" colspan="2">
+                                            <field name="invoiced" select="2"/>
+                                            <button colspan="1" name="%(sale.action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoice" type="action"/>
+                                        </group>
+                                    </page>
+                                    <page groups="base.group_extended" string="Extra Info">
+										<field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
+										<field groups="product.group_uos" name="product_uos"/>
+										<field name="address_allotment_id" select="2"/>
+										<separator colspan="4" string="Properties"/>
+										<field colspan="4" name="property_ids" nolabel="1"/>
+                                    </page>
+                                    <page string="Notes">
+                                        <field colspan="4" name="notes" nolabel="1"/>
+                                    </page>
+                                    <page string="History" groups="base.group_extended">
+                                        <separator colspan="4" string="Invoice Lines"/>
+                                        <field colspan="4" name="invoice_lines" nolabel="1"/>
+                                        <separator colspan="4" string="Stock Moves"/>
+                                        <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                                    </page>
+                                </notebook>
+							</form>
+							<tree string="Sales order lines">
+                                    <field colspan="4" name="name"/>
+                                    <field name="product_uom_qty" string="Qty"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="discount"/>
+                                    <field name="price_unit"/>
+                                    <!-- field name="price_net"/-->
+                                    <field name="price_subtotal"/>
+                                    <field name="sequence"/>
+                                </tree>
+					</field>
+				</xpath>
+			</field>
+		</record>
+
+	</data>
+</openerp>
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index 0a0d523a7ae..3a59a69f105 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -26,7 +26,7 @@
     This module adds the 'Margin' on sales order,
     which gives the profitability by calculating the difference between the Unit Price and Cost Price
     """,
-    "author":"Tiny",
+    "author":"OpenERP SA",
     "depends":["sale"],
     "demo_xml":[],
     "update_xml":["security/ir.model.access.csv","sale_margin_view.xml","report/report_margin_view.xml"],
diff --git a/addons/sale_margin/i18n/pl.po b/addons/sale_margin/i18n/pl.po
new file mode 100644
index 00000000000..ba7e650faad
--- /dev/null
+++ b/addons/sale_margin/i18n/pl.po
@@ -0,0 +1,371 @@
+# Polish 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: 2009-11-25 14:28+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-07-27 03:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Refund"
+msgstr "Korekta dla klienta"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "report.account.invoice.product"
+msgstr ""
+
+#. 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
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_product
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_product
+msgid "Invoices by Product"
+msgstr "Faktury wg produktów"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Invoice"
+msgstr "Faktura dla klienta"
+
+#. module: sale_margin
+#: wizard_view:stock.invoice_onshipping,init:0
+msgid "Create invoices"
+msgstr "Utwórz faktury"
+
+#. 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
+#: model:ir.model,name:sale_margin.model_report_account_invoice_partner_product
+msgid "report.account.invoice.partner.product"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Invoice"
+msgstr "Faktura Dostawcy"
+
+#. module: sale_margin
+#: field:report.account.invoice,state:0
+#: field:report.account.invoice.category,state:0
+#: field:report.account.invoice.partner,state:0
+#: field:report.account.invoice.partner.product,state:0
+#: field:report.account.invoice.product,state:0
+msgid "State"
+msgstr "Stan"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr "Utwórz fakturę"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Draft"
+msgstr "Projekt"
+
+#. 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
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_month_product
+msgid "All Months"
+msgstr "Wszystkie miesiące"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree_all
+msgid "report.account.invoice.partner.product.tree"
+msgstr ""
+
+#. module: sale_margin
+#: field:report.account.invoice,type:0
+#: field:report.account.invoice.category,type:0
+#: field:report.account.invoice.partner,type:0
+#: field:report.account.invoice.partner.product,type:0
+#: field:report.account.invoice.product,type:0
+#: wizard_field:stock.invoice_onshipping,init,type:0
+msgid "Type"
+msgstr "Typ"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,journal_id:0
+msgid "Destination Journal"
+msgstr "Dziennik docelowy"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Supplier Invoices"
+msgstr "Faktury od dostawców"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: sale_margin
+#: view:report.account.invoice.partner:0
+msgid "Invoices by partner"
+msgstr "Faktury wg partnerów"
+
+#. module: sale_margin
+#: view:report.account.invoice.category:0
+msgid "Invoices by category"
+msgstr "Faktury wg kategorii"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Paid"
+msgstr "Zapłacono"
+
+#. module: sale_margin
+#: model:ir.actions.wizard,name:sale_margin.wizard_picking_invoice_create
+#: wizard_button:stock.invoice_onshipping,init,create_invoice:0
+msgid "Create invoice"
+msgstr "Utwórz fakturę"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree_all
+msgid "report.account.invoice.category.tree"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner_product
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner_product
+msgid "Invoices by Partner and Product"
+msgstr "Faktury wg partnerów i produktów"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_category
+msgid "report.account.invoice.category"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "Bieżący miesiąc"
+
+#. module: sale_margin
+#: field:report.account.invoice.category,categ_id:0
+msgid "Categories"
+msgstr "Kategorie"
+
+#. module: sale_margin
+#: field:account.invoice.line,cost_price:0
+#: field:report.account.invoice,cost_price:0
+#: field:report.account.invoice.category,cost_price:0
+#: field:report.account.invoice.partner,cost_price:0
+#: field:report.account.invoice.partner.product,cost_price:0
+#: field:report.account.invoice.product,cost_price:0
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Cena (koszt)"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,group:0
+msgid "Group by partner"
+msgstr "Grupuj wg partnera"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_partner
+msgid "report.account.invoice.partner"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner
+msgid "Invoices by Partner"
+msgstr "Faktury wg partnerów"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_category
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_category
+msgid "Invoices by Category"
+msgstr "Faktury wg kategorii"
+
+#. module: sale_margin
+#: view:report.account.invoice.partner.product:0
+msgid "Invoices by partner and product"
+msgstr "Faktury wg partnerów i produktów"
+
+#. module: sale_margin
+#: field:report.account.invoice,amount:0
+#: field:report.account.invoice.category,amount:0
+#: field:report.account.invoice.partner,amount:0
+#: field:report.account.invoice.partner.product,amount:0
+#: field:report.account.invoice.product,amount:0
+msgid "Amount"
+msgstr "Kwota"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,invoice_date:0
+msgid "Invoiced date"
+msgstr "Data fakturowania"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Refund"
+msgstr "Korekta od dostawcy"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree_all
+msgid "report.account.invoice.partner.tree"
+msgstr ""
+
+#. module: sale_margin
+#: field:report.account.invoice,margin:0
+#: field:report.account.invoice.category,margin:0
+#: field:report.account.invoice.partner,margin:0
+#: field:report.account.invoice.partner.product,margin:0
+#: field:report.account.invoice.product,margin:0
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Marża"
+
+#. module: sale_margin
+#: field:report.account.invoice,quantity:0
+#: field:report.account.invoice.category,quantity:0
+#: field:report.account.invoice.partner,quantity:0
+#: field:report.account.invoice.partner.product,quantity:0
+#: field:report.account.invoice.product,quantity:0
+msgid "Quantity"
+msgstr "Ilość"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr "Faktury wg produktów"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sale Orders"
+msgstr "Marże w zamówieniach sprzedaży"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice
+msgid "report.account.invoice"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices
+#: view:report.account.invoice:0
+#: view:stock.picking:0
+#: field:stock.picking,invoice_ids:0
+msgid "Invoices"
+msgstr "Faktury"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: sale_margin
+#: field:report.account.invoice,name:0
+#: field:report.account.invoice.category,name:0
+#: field:report.account.invoice.partner,name:0
+#: field:report.account.invoice.partner.product,name:0
+#: field:report.account.invoice.product,name:0
+msgid "Month"
+msgstr "Miesiąc"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Canceled"
+msgstr "Anulowano"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale_margin
+#: wizard_button:stock.invoice_onshipping,init,end:0
+msgid "Cancel"
+msgstr "Anuluj"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner,partner_id:0
+#: field:report.account.invoice.partner.product,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree_all
+msgid "report.account.invoice.tree"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Open"
+msgstr "Otwarte"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree_all
+msgid "report.account.invoice.product.tree"
+msgstr ""
diff --git a/addons/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml
index b22c2e28801..1dcafe50de3 100644
--- a/addons/sale_margin/report/report_margin_view.xml
+++ b/addons/sale_margin/report/report_margin_view.xml
@@ -50,7 +50,7 @@
         	            <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/> 						                    
                     </group>
                      <newline/>
-	    			<group expand="0" string="Extended options..." groups="base.group_extended">
+	    			<group expand="0" string="Extended Filters..." groups="base.group_extended">
 	                    <field name="date" string="Date Invoiced"/>
 	                    <separator orientation="vertical"/>
 	                    <field name="partner_id" widget="selection"/>
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 1496e46c87e..79a08afd57a 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -30,7 +30,7 @@
     orders generated from sale orders.
     It adds sale name and sale Reference on production order
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['mrp', 'sale'],
     'init_xml': [],
diff --git a/addons/sale_mrp/i18n/pl.po b/addons/sale_mrp/i18n/pl.po
new file mode 100644
index 00000000000..d4c0866d194
--- /dev/null
+++ b/addons/sale_mrp/i18n/pl.po
@@ -0,0 +1,81 @@
+# Polish 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-06-28 09:21+0000\n"
+"PO-Revision-Date: 2010-07-26 15:04+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-07-27 03:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sale order."
+msgstr "Określ odnośnik klienta z zamówienia sprzedaży"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+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"
+msgstr "Nazwa sprzedaży"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Zamówienie produkcji"
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid ""
+"\n"
+"    This module provides facility to the user to install mrp and sale "
+"modules\n"
+"    at a time. It is basically used when we want to keep track of "
+"production\n"
+"    orders generated from sale orders.\n"
+"    It adds sale name and sale Reference on production order\n"
+"    "
+msgstr ""
+"\n"
+"    Ten moduł zwiększający funkcjonalność modułów mrp i sale. \n"
+"    Jest on stosowany głównie kiedy chcemy losy zamówień \n"
+"    produkcji tworzonych z zamówień sprzedaży.\n"
+"    Moduł dodaje nazwę sprzedaży i odnośnik sprzedaży do \n"
+"    zamówienia produkcji.\n"
+"    "
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr "Odnośnik sprzedaży"
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr "Zarządzanie sprzedażą i MRP"
diff --git a/addons/sale_mrp/i18n/sl.po b/addons/sale_mrp/i18n/sl.po
new file mode 100644
index 00000000000..4c27df121ed
--- /dev/null
+++ b/addons/sale_mrp/i18n/sl.po
@@ -0,0 +1,73 @@
+# 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-06-28 09:21+0000\n"
+"PO-Revision-Date: 2010-07-28 12:42+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-07-29 03:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+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"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid ""
+"\n"
+"    This module provides facility to the user to install mrp and sale "
+"modules\n"
+"    at a time. It is basically used when we want to keep track of "
+"production\n"
+"    orders generated from sale orders.\n"
+"    It adds sale name and sale Reference on production order\n"
+"    "
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr ""
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index c58e68bdbe7..ad36d7c582d 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -21,7 +21,9 @@
 
 from osv import fields, osv
 import time
-from mx import DateTime
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
 class sale_order_dates(osv.osv):
     _inherit = 'sale.order'
     _name = 'sale.order'
@@ -45,7 +47,7 @@ class sale_order_dates(osv.osv):
         for order in self.browse(cr, uid, ids):
             dates_list = []
             for line in order.order_line:
-                dt=DateTime.strptime(order.date_order, '%Y-%m-%d') + DateTime.RelativeDateTime(days=line.delay or 0.0)
+                dt = datetime.strptime(order.date_order, '%Y-%m-%d') + relativedelta(days=line.delay or 0.0)
                 dt_s = dt.strftime('%Y-%m-%d')
                 dates_list.append(dt_s)
             if dates_list:
diff --git a/addons/scrum/i18n/ar.po b/addons/scrum/i18n/ar.po
deleted file mode 100644
index 84b8d28c47a..00000000000
--- a/addons/scrum/i18n/ar.po
+++ /dev/null
@@ -1,893 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr ""
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr ""
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/bg.po b/addons/scrum/i18n/bg.po
deleted file mode 100644
index 42698e099ce..00000000000
--- a/addons/scrum/i18n/bg.po
+++ /dev/null
@@ -1,910 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"PO-Revision-Date: 2010-03-29 11:28+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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Име на среща"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr "Създай задача от \"недовършено\""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Мои задачи"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Създай задача от \"недовършено\""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Невалидно име на модел при задаването на действие."
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Напредък"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-"Общо оставащо време, може да бъре преоценявано периодично от пълномощника на "
-"задачата."
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Подпроект"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr "Какво сте свършили от вчера до днес ?"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr "Членове на проекта"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Делегирани задачи"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Хедер, който се добавя в началото на имейла с предупредително съобщение към "
-"клиента, когато дадена задача е приключена."
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Важност"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-"Член на проекта. Не се използва в каквито и да е изчисления, а само с "
-"информационна цел."
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Много спешно"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-"Очаквано време за приключване на задачата, обикновено се задава от "
-"ръководителят на проекта когато задачата е в състояние на чернова."
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Бележки"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Проект"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-"Ако изберете това поле, ръководителят на проекта ще получава запитване при "
-"всяко приключване на задача от неговия екип."
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Отказани"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Име на екип"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr "Хедер на писмо"
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Крайна дата"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Аналитична сметка"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Всички задачи"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Краен срок"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "Партньор"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Планирани часове"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "Шаблон"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Важност"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Състояние"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr "Вътрешно описание на проекта."
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Изчислено по: Изтекло време + Оставащо време."
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Вид"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Средно"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "Общо време"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr "Планирано време"
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Задачи за днес"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Задачи от вчера"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Начална дата"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Проекти"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Подробности на задачата"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Прегледай задачите на проекта"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr "Часове забавяне"
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Контакт"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Дата на среща"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Задачи"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Създадени задачи"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "Напредък (%)"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Изчислено по: Изтекло време / Общо време"
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "Отворени задачи"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr "Незадължителна информация"
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr "Сбор на всички часове по всички задачи свързани с този проект."
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Преглед"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Бележка"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Чернова"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Нисък"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Мои отворени задачи"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr "Ръководител на проект"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "Висящи"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr "Има ли нещо което да ви пречи ?"
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Състояние"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "Отнето време"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "Име на проект"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Собственик на продукта"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Потребител"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Активен"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-"Изчислено по: Общо време - Очаквано време. Това дава разликата между "
-"очакваното време от ръководителят на проекта и реалното време за приключване "
-"на задачата."
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "Работно време"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "Работата завършена"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "Делегирано на"
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Дата на приключване"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Назначено на"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr "Сума на отнетите часове по всички задачи свързани с този роект."
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"Ако имате [?] в името на проекта, това означава че няма свързана аналитична "
-"сметка към този проект."
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr "Сума на планираните часове по всички задачи свързани с този проект."
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr "Уведомяване на партньор"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "Резюме на задача"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Готово"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Отказ"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Отвoри"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Ефективни часове"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr "Уведомяване на ръководител"
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "Изпълнява се"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Оставащи часове"
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "Родителска задача"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Възможност"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Много ниско"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Планирани часове"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "Редактиране на проекти"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Описание"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Спешно"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Ежедневни срещи"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "Върху какво работите днес ?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr "Изпълнява се"
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Напредък"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "Родителски проект"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Подробности за задачите"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr "Отнети часове"
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Контекст"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr "Общо часове"
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Потребители"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Последователност"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Създадени задачи"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Възложи на"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr "Очакван край"
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/bs.po b/addons/scrum/i18n/bs.po
deleted file mode 100644
index 209d05ce047..00000000000
--- a/addons/scrum/i18n/bs.po
+++ /dev/null
@@ -1,894 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Moji zadaci"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Napredak"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr "Članovi Projekta"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Delegirani Zadaci"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Važnost"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Vrlo hitno"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Bilješke"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Projekat"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Poništeno"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Naziv Tima"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Završni Datum"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Svi Zadaci"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Rok izvršenja"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Planirani Sati"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "Šablon"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Prioritet"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Stanje"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr "Interni opis projekta."
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Vrsta"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Srednji"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "Ukupno Vrijeme"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr "Planirano Vrijeme"
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Današnji zadaci"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Zadaci od jučer"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Početni Datum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Projekti"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Detalji Zadataka"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Pogledaj zadatke projekta"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Zadaci"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Kreiraj Zadatke"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "Napredak (%)"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "Otvoreni zadaci"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Pregled"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Zabilješka"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Skica"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Nizak"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Moji otvoreni zadaci"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Status"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "Potrošeno Vrijeme"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "Naziv Projekta"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Vlasnik Proizvoda"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Korisnik"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Aktivan"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "Radno Vrijeme"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Dodijeljen"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr "Upozori Partnera"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr ""
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "U Toku"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: 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: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Preostali Sati"
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Vrlo Nisko"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Planirani sati"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Hitno"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Dnevni Sastanci"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "Na čemu radiš danas?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progres (0-100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalji Zadataka"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr "Potrošeni Sati"
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Kontekst"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr "Ukupno Sati"
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Korisnici"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Kreirani zadaci"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Dodijeli"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr "Očekivani Kraj"
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/ca.po b/addons/scrum/i18n/ca.po
deleted file mode 100644
index e25cafb9f23..00000000000
--- a/addons/scrum/i18n/ca.po
+++ /dev/null
@@ -1,926 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"PO-Revision-Date: 2009-12-20 17:36+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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr "Scrum backlog del producte"
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Nom de reunió"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr "Des de backlog crea tasca."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Les meves tasques"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr "Els meus sprints oberts (responsable de producte)"
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Crea tasca des de backlogs"
-
-#. module: 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: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr "Scrum, mètode de desenvolupament àgil"
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Progrés"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-"Total temps restant, pot ser reestimat periòdicament per qui se li ha "
-"assignat la tasca."
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Subprojecte"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr "Què heu aconseguit des d'ahir?"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr "És exacta la vostra estimació del sprint backlog?"
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr "Membres del projecte"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr "Projectes scrum"
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Tasques delegades"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Capçalera afegida al principi del correu electrònic del missatge d'avís "
-"enviat al client quan es tanca una tasca."
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Importància"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr "Tasca scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Vista backlogs del projecte"
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-"Membres del projecte. No utilitzat en cap càlcul, només per tal d'informar."
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Molt urgent"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Sprint retrospectiu"
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nom del sprint"
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-"Temps estimat per a realitzar la tasca, normalment fixat pel responsable del "
-"projecte quan la tasca està en estat esborrany."
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Notes"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Backlog del producte"
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Projecte"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-"Si marqueu aquest camp, el responsable del project rebrà un avís cada vegada "
-"que una tasca sigui completada pel seu equip."
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Cancel·lat"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Nom d'equip"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr "Capçalera correu"
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Dies del sprint"
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Data de fi"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Calculat utilitzant la suma de les tasques realitzades."
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-"Si marqueu això, a l'usuari li apareixerà una finestra emergent quan tanqui "
-"una tasca que proposarà un missatge per ser enviat per correu electrònic al "
-"client."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Vista tasques del sprint"
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Compte analític"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Totes les tasques"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Data límit"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Hores planejades"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "Plantilla"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Prioritat (0=Molt urgent)"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Estat"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-"Percentatge de tasques tancades segons el total de tasques a realitzar."
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr "Descripció interna del projecte."
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr "Scrum diari"
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Calculat com: Temps dedicat + Temps restant."
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Tipus"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr "Dades scrum"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Mitja"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "Temps total"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr "Temps previst"
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tasques per avui"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Tasques des d'ahir"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Data d'inici"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Projectes"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Detalls de tasca"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Vista tasques del projecte"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr "Retard hores"
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Contacte"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr "Tasques scrum"
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Data de reunió"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Tasques"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospectiu"
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Crea tasques"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "Progrés (%)"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculat com: Temps dedicat / Temps total."
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr "És scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr "Backlogs esborrany"
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint backlog"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "Tasques obertes"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Bloqueigs trobats"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr "Info. opcional"
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-"Suma del total d'hores de totes les tasques relacionades amb aquest projecte."
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum sprint"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Revisió"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr "Els meus sprints oberts (scrum master)"
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Esborrany"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Baixa"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Les meves tasques obertes"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr "Responsable de projecte"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "Pendent"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr "Hi ha alguna cosa que us bloquea?"
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Posició"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr "Sprints oberts"
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "Temps dedicat"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "Nom del projecte"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Responsable del producte"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr "Els meus sprints (scrum master)"
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Backlog del producte"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Usuari"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Actiu"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-"Calculat com: Temps total - Temps estimat. Proporciona la diferència entre "
-"el temps estimat pel responsable del projecte i el temps real al tancar la "
-"tasca."
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr "Període de temps"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr "Sprints esborrany"
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "Temps treballat"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "Treball realitzat"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Vista backlogs del sprint"
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "Delegat a"
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Data de tancament"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Assignat a"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Backlogs exactes"
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-"Suma de les hores dedicades de totes les tasques relacionades amb aquest "
-"projecte."
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"Si teniu [?] en el nom del projecte, significa que no hi ha compte analític "
-"vinculat a aquest projecte."
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-"Suma de les hores previstes de totes les tasques relacionades amb aquest "
-"projecte."
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr "Avisa empresa"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr "Els meus sprints (responsable de producte)"
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "Resum de tasca"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-"Enllaceu aquest projecte a un compte analític si necessita la gestió "
-"financera dels projectes. Us permet connectar els projectes amb "
-"pressupostos, planificació, anàlisi de costos i ingressos, temps dedicat en "
-"els projectes, etc."
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Realitzat"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Obert"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Hores reals"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr "Avisa responsable"
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "En progrés"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Revisió del sprint"
-
-#. module: 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: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Hores restants"
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "Tasca pare"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Característica"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Molt baixa"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-"Hores de treball de l'horari per a ajustar l'informe del diagrama de Gantt"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr "Sprints realitzats"
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr "Tasca de backlog"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Hores planejades"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "Edita projectes"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr "Reunió scrum"
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Descripció"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Urgent"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Reunions diàries"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "En què esteu treballant avui?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr "En procés"
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progrés (0-100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr "Equip scrum"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr "Projecte scrum"
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "Projecte pare"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Info. del sprint"
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum master"
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalls de tasques"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr "Hores dedicades"
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Context"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr "Total hores"
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Usuaris"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Seqüència"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Peu afegit al final del correu electrònic del missatge d'avís enviat al "
-"client quan es tanca una tasca."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr "Backlogs oberts"
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Crea tasques"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr "Error! No podeu crear projectes recursius."
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Assigna a"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr "Fi previst"
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr "Peu correu"
diff --git a/addons/scrum/i18n/cs.po b/addons/scrum/i18n/cs.po
deleted file mode 100644
index 95b1a8d11e2..00000000000
--- a/addons/scrum/i18n/cs.po
+++ /dev/null
@@ -1,893 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr ""
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Storno"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr ""
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/de.po b/addons/scrum/i18n/de.po
deleted file mode 100644
index 2aa1e064c52..00000000000
--- a/addons/scrum/i18n/de.po
+++ /dev/null
@@ -1,918 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"PO-Revision-Date: 2009-11-22 19:33+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr "Scrum Produkt Backlog"
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Meeting Bezeichnung"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr "Erzeuge Aufgabe aus Backlog"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Meine Aufgaben"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr "Meine offenen Sprints (Product Owner)"
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Erzeuge Aufgabe aus Backlog"
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr "Scrum, agile Entwicklungsmethode"
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Fortschritt"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-"Verbleibende Gesamtzeit, kann periodisch neu berechnet werden durch die "
-"Bearbeitung von Aufgaben."
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Subprojekt"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr "Was haben Sie seit gestern erledigt?"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr "Sind die Erwartungen Ihres Sprint Backlogs korrekt?"
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr "Projekt Mitarbeiter"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr "Scrum Projekte"
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Delegierte Aufgaben"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Header zu Beginn der EMail mit der Meldung an den Kunden bezüglich des "
-"Abschlusses von Aufgaben (Status closed)"
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Wichtigkeit"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr "Scrum Aufgabe"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Zeige Projekt Backlog"
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-"Projektmitarbeiter die in keiner Berechnung verwendet werden und nur zur "
-"Information aufgelistet sind."
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Sehr dringend"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Sprint Rückbetrachtung"
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Sprint Bezeichnung"
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-"Erwartete Zeit für die Aufgabe, normalerweise eingetragen durch den "
-"Projektmanager im Stadium des Entwurfs."
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Bemerkungen"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Produkt Backlog"
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Projektportal"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-"Falls Sie dieses Feld anhaken, erhält der Projektmanager jedesmal eine EMail "
-" wenn eine Aufgabe erledigt ist."
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Abgebrochen"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Name Team"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr "Mail Header"
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Sprint Tage"
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Enddatum"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Berechnet auf Basis der Summe der abgearbeiteten Aufgaben."
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-"Falls Sie hier einen Haken setzen, wird der Benutzer bei Beendigung einer "
-"Aufgabe ein Popup Fenster erhalten mit dem Vorschlag eine Nachricht per "
-"EMail an den Kunden zu versenden."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Anzeige Sprint Aufgaben"
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Analytisches Konto"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Alle Aufgaben"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Deadline"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "geplante Stunden"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "Vorlage"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Priorität"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Status"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr "Prozent erledigte Aufgaben zu Gesamtsumme der offenen Aufgaben."
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr "Interne Projektbeschreibung"
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr "Daily Scrum"
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Berechnet als: Zeitaufwand + Verbleibende Zeit"
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Typ"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr "Scrum Daten"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Medium"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "Gesamtzeit"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr "Geplante Zeit"
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Aufgaben von Heute"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Aufgaben seit Gestern"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Anfangsdatum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Projekte"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Aufgabenliste"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Zeige Aufgaben aus Projekten"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr "Verzögerung in Stunden"
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr "Scrum Aufgaben"
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Datum Meeting"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospektive"
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Erzeuge Aufgabe"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "Mein Aufgabenfortschritt"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Berechnet als: Investierte Zeit / Gesamtzeit"
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr "Ist Scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr "Entwurf Backlogs"
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Erfasse die benötigte Zeit für Ihre Aufgaben"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "Offene Aufgaben"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Hindernissliste"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr "Optionale Information"
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr "Summe Stunden aller Aufgaben zu diesem Projekt."
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum Sprint"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Bewertung"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr "Meine offenen Sprints (Scrum Master)"
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Bemerkung"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Entwurf"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Ausreichend"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Meine offenen Aufgaben"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr "Projekt Manager"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "Im Wartezustand"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr "Gibt es Hindernisse?"
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Status"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr "Offene Sprints"
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "Zeitbedarf"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "Projekt Bezeichnung"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Product Owner"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr "Meine Projekte (Scrum Master)"
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Produkt Backlog"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Benutzer"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Aktiv"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-"Berechnet als: Gesamte Zeit - Erwartete Zeit. Der Wert liefert die Differenz "
-"der erwarteten Zeiten seitens der Projektmanager und der tatsächlichen Zeit "
-"um das Projekt abzuschließen."
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr "Aufgabenliste"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr "Entwurf Sprint"
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "Arbeitszeit"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "Arbeit erledigt"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Anzeige Sprint Backlog"
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "Delegiert an"
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Datum Ende"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Zuweisung an"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Backlog Spezifizierung"
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr "Summe projektbezogene Stunden"
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"Ein [?] im Projektnamen bedeutet, dass es kein Analysekonto für diese "
-"Projekt gibt"
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr "Summe geplanter Stunden über alle Aufgaben des Projektes."
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr "Warne Partner"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr "Meine Sprints (Product Owner)"
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "Bezeichnung Aufgabe"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-"Für finanzilelle Auswertungen muss ein Projekt einem Anakysekonto zugeordnet "
-"werden. Damit können Projekte Budgets,Planung, Kosten und Erlösen, "
-"Arbeitszeitaufzeichnungen zugeordnet werden."
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Erledigt"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Offen"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Effektive Stunden"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr "Warne Manager"
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "In Bearbeitung"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Sprint Rückbetrachtung"
-
-#. module: 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"
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Verbleibende Stunden"
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "(Ober-) Aufgabe"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Funktion"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Sehr gering"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "Zeiterfassung Arbeitsstunden für die Ausrichtung des Gantt Charts"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr "Erledigte Sprints"
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr "Backlog Aufgabe"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Geplante Stunden"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "Editiere Projekte"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr "Scrum Meeting"
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Beschreibung"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Dringend"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Daily Meetings"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "Was hast Du heute erledigt?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr "In Weiterbearbeitung"
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Fortschritt (0-100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr "Scrum Team"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr "Scrum Projekt"
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "Hauptprojekt"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Sprint Information"
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum Master"
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Aufgabendetails"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr "geleistete Stunden"
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Kontext"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr "Gesamte Stunden"
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Benutzer"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Sequenz"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Footer zu Beginn der Mail für die Mitteilung an den Kunden wenn Aufgabe "
-"geschlossen wird."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr "Offene Backlogs"
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Erzeugte Aufgaben"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr "Fehler! Sie können keine rekursiven Projekte definieren."
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Zuordnen zu"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr "Erwartetes Ende"
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr "Mail Footer"
diff --git a/addons/scrum/i18n/es.po b/addons/scrum/i18n/es.po
deleted file mode 100644
index 5bc27170c9b..00000000000
--- a/addons/scrum/i18n/es.po
+++ /dev/null
@@ -1,926 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"PO-Revision-Date: 2009-12-20 17:46+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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr "Scrum backlog del producto"
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Nombre de reunión"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr "Desde backlog crear tarea."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Mis tareas"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr "Mis sprints abiertos (responsable de producto)"
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Crear tarea desde backlogs"
-
-#. module: scrum
-#: 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: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr "Scrum, método de desarrollo ágil"
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Progreso"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-"Total tiempo restante, puede ser reestimado periódicamente por quien se le "
-"ha asignado la tarea."
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Subproyecto"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr "¿Qué ha conseguido desde ayer?"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr "¿Es exacta su estimación del sprint backlog?"
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr "Miembros del proyecto"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr "Proyectos scrum"
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Tareas delegadas"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Cabecera añadida al principio del correo electrónico del mensaje de aviso "
-"enviado al cliente cuando una tarea se cierra."
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Importancia"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr "Tarea scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Vista backlogs del proyecto"
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-"Miembros del proyecto. No utilizado en ningún cálculo, sólo con el propósito "
-"de informar."
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Muy urgente"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Sprint retrospectivo"
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nombre del sprint"
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-"Tiempo estimado para realizar la tarea, normalmente fijado por el "
-"responsable del proyecto cuando la tarea está en estado borrador."
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Backlog del producto"
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-"Si marca este campo, el responsable del proyecto recibirá un aviso cada vez "
-"que una tarea sea completada por su equipo."
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Nombre del equipo"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr "Cabecera correo"
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Días del sprint"
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Fecha de fin"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Calculado usando la suma de las tareas realizadas."
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-"Si marca esto, al usuario le aparecerá una ventana emergente cuando cierre "
-"una tarea que propondrá un mensaje para ser enviado por correo electrónico "
-"al cliente."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Vista tareas del sprint"
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Todas las tareas"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Fecha límite"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Horas planeadas"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "Plantilla"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Prioridad"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Estado"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr "Porcentaje de tareas cerradas según el total de tareas a realizar."
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr "Descripción interna del proyecto."
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr "Scrum diario"
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr "Datos scrum"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Media"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "Tiempo total"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr "Tiempo previsto"
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tareas para hoy"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Tareas desde ayer"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Fecha de inicio"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Proyectos"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Detalles de tarea"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Vista tareas del proyecto"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr "Retraso horas"
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr "Tareas scrum"
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Fecha de reunión"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Tareas"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospectivo"
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Crear tareas"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "Progreso (%)"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculado como: Tiempo dedicado / Tiempo total."
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr "Es scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr "Backlogs borrador"
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint backlog"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "Tareas abiertas"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Bloqueos encontrados"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr "Info. opcional"
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-"Suma del total de horas de todas las tareas relacionadas con este proyecto."
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum sprint"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Revisión"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr "Mis sprints abiertos (scrum master)"
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Baja"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Mis tareas abiertas"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr "Responsable de proyecto"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr "¿Hay algo que le bloquea?"
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr "Sprints abiertos"
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "Tiempo dedicado"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "Nombre del proyecto"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Responsable del producto"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr "Mis sprints (scrum master)"
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Backlog del producto"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-"Calculado como: Tiempo total - Tiempo estimado. Proporciona la diferencia "
-"entre el tiempo estimado por el responsable del proyecto y el tiempo real al "
-"cerrar la tarea."
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr "Periodo de tiempo"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr "Sprints borrador"
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "Tiempo trabajado"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "Trabajo realizado"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Vista backlogs del sprint"
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "Delegado a"
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Fecha de cierre"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Asignado a"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Exactitud de los backlogs"
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-"Suma de las horas dedicadas de todas las tareas relacionadas con este "
-"proyecto."
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"Si tiene [?] en el nombre del proyecto, significa que no hay cuenta "
-"analítica vinculada a este proyecto."
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-"Suma de las horas previstas de todas las tareas relacionadas con este "
-"proyecto."
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr "Avisar empresa"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr "Mis sprints (responsable de producto)"
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "Resumen de tarea"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-"Enlace este proyecto a una cuenta analítica si necesita la gestión "
-"financiera de los proyectos. Le permite conectar los proyectos con "
-"presupuestos, planificación, análisis de costes e ingresos, tiempo dedicado "
-"en los proyectos, etc."
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Abierto"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Horas reales"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr "Avisar responsable"
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "En progreso"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Revisión del sprint"
-
-#. module: 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: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Horas restantes"
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "Tarea padre"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Característica"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Muy baja"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-"Horas de trabajo del horario para ajustar el informe del diagrama de Gantt"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr "Sprints realizados"
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr "Tarea de backlog"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Horas planeadas"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "Editar proyectos"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr "Reunión scrum"
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Urgente"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Reuniones diarias"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "¿En qué está trabajando hoy?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr "En proceso"
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progreso (0-100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr "Equipo scrum"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr "Proyecto scrum"
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "Proyecto padre"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Info. del sprint"
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum master"
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalles de tareas"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr "Horas dedicadas"
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Contexto"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr "Total horas"
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Usuarios"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Pie añadido al final del correo electrónico del mensaje de aviso enviado al "
-"cliente cuando una tarea se cierra."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr "Backlogs abiertos"
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Crear tareas"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr "¡Error! No puede crear proyectos recursivos."
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Asignar a"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr "Fin previsto"
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr "Pie correo"
diff --git a/addons/scrum/i18n/es_AR.po b/addons/scrum/i18n/es_AR.po
deleted file mode 100644
index 960161bf927..00000000000
--- a/addons/scrum/i18n/es_AR.po
+++ /dev/null
@@ -1,925 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr "Scrum backlog del producto"
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Nombre de reunión"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr "Desde backlog crear tarea."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Mis tareas"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr "Mis sprints abiertos (responsable de producto)"
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Crear tarea desde backlogs"
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr "Scrum, método de desarrollo ágil"
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Progreso"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-"Total tiempo restante, puede ser reestimado periódicamente por quien se le "
-"ha asignado la tarea."
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Sub-Proyecto"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr "¿Qué ha conseguido desde ayer?"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr "¿Es exacta su estimación del sprint backlog?"
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr "Miembros del proyecto"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr "Proyectos scrum"
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Tareas delegadas"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Cabecera añadida al principio del correo electrónico del mensaje de aviso "
-"enviado al cliente cuando una tarea se cierra."
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Importancia"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr "Tarea scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Vista backlogs del proyecto"
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-"Miembros del proyecto. No utilizado en ningún cálculo, sólo con el propósito "
-"de informar."
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Urgente"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Sprint retrospectivo"
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nombre del sprint"
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-"Tiempo estimado para realizar la tarea, normalmente fijado por el "
-"responsable del proyecto cuando la tarea está en estado borrador."
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Backlog del producto"
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-"Si marca este campo, el responsable del proyecto recibirá un aviso cada vez "
-"que una tarea sea completada por su equipo."
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Nombre del equipo"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr "Cabecera correo"
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Días del sprint"
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Fecha finalización"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Calculado usando la suma de las tareas realizadas."
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-"Si marca esto, al usuario le aparecerá una ventana emergente cuando cierre "
-"una tarea que propondrá un mensaje para ser enviado por correo electrónico "
-"al cliente."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Vista tareas del sprint"
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Todas las Tareas"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Fecha límite"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Horas planeadas"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "Plantilla"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Prioridad"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Provincia"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr "Porcentaje de tareas cerradas según el total de tareas a realizar."
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr "Descripción interna del proyecto."
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr "Scrum diario"
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr "Datos scrum"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Medio"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "Tiempo total"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr "Tiempo previsto"
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tareas para hoy"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Tareas desde ayer"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Fecha de inicio"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Proyectos"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista !"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Detalles de tarea"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Vista tareas del proyecto"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr "Retraso horas"
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr "Tareas scrum"
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Fecha de reunión"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Tareas"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospectivo"
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Crear tareas"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "Progreso (%)"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculado como: Tiempo dedicado / Tiempo total."
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr "Es scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr "Backlogs borrador"
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint backlog"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "Tareas abiertas"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Bloqueos encontrados"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr "Info. opcional"
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-"Suma del total de horas de todas las tareas relacionadas con este proyecto."
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum sprint"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Revisión"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr "Mis sprints abiertos (scrum master)"
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Bajo"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Mis tareas abiertas"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr "Responsable de proyecto"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr "¿Hay algo que le bloquea?"
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr "Sprints abiertos"
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "Tiempo dedicado"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "Nombre del proyecto"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Responsable del producto"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr "Mis sprints (scrum master)"
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Backlog del producto"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-"Calculado como: Tiempo total - Tiempo estimado. Proporciona la diferencia "
-"entre el tiempo estimado por el responsable del proyecto y el tiempo real al "
-"cerrar la tarea."
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr "Periodo de tiempo"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr "Sprints borrador"
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "Horario de trabajo"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "Trabajo realizado"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Vista backlogs del sprint"
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "Delegado a"
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Fecha de cierre"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Asignado a"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Exactitud de los backlogs"
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-"Suma de las horas dedicadas de todas las tareas relacionadas con este "
-"proyecto."
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"Si tiene [?] en el nombre del proyecto, significa que no hay cuenta "
-"analítica vinculada a este proyecto."
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-"Suma de las horas previstas de todas las tareas relacionadas con este "
-"proyecto."
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr "Advertir al partner"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr "Mis sprints (responsable de producto)"
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "Resumen de Tarea"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-"Enlace este proyecto a una cuenta analítica si necesita la gestión "
-"financiera de los proyectos. Le permite conectar los proyectos con "
-"presupuestos, planificación, análisis de costes e ingresos, tiempo dedicado "
-"en los proyectos, etc."
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Abierto"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Horas reales"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr "Avisar responsable"
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Revisión del sprint"
-
-#. module: 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: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Horas restantes"
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "Tarea padre"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Característica"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Muy baja"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-"Horas de trabajo del horario para ajustar el informe del diagrama de Gantt"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr "Sprints realizados"
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr "Tarea de backlog"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Horas planeadas"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "Editar proyectos"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr "Reunión scrum"
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Urgente"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Reuniones diarias"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "¿En qué está trabajando hoy?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr "En ejecución"
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progreso (0-100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr "Equipo scrum"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr "Proyecto scrum"
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "Proyecto padre"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Info. del sprint"
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum master"
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalles de tareas"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr "Horas dedicadas"
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Contexto"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr "Total horas"
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Usuarios"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Pie añadido al final del correo electrónico del mensaje de aviso enviado al "
-"cliente cuando una tarea se cierra."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr "Backlogs abiertos"
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Crear tareas"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr "¡Error! No puede crear proyectos recursivos."
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Asignar a"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr "Fin previsto"
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr "Pie de correo"
diff --git a/addons/scrum/i18n/et.po b/addons/scrum/i18n/et.po
deleted file mode 100644
index 5f97d21ea10..00000000000
--- a/addons/scrum/i18n/et.po
+++ /dev/null
@@ -1,915 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"PO-Revision-Date: 2009-11-09 19: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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr "Scrum toodete backlog"
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Koosoleku nimi"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr "Loo ülesanne backlogist."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Minu ülesanded"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr "Minu avatud sprindid (toote omanik)"
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Loo ülesanded backlogist"
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr "Scrum, nobe arendamise meetod"
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Edenemine"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-"Järelejäänud aeg kokku. Seda saab ümberhinnata perioodiliselt isik, kellele "
-"ülesande on määratud."
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Alamprojekt"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr "Mida sa oled saavutanud eilsest alates?"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr "Kas Teie Sprint Backlog hinnang on täpne?"
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr "Projekti liikmed"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr "Scrum projektid"
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Volitatud ülesanded"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Ülesande sulgemisel kliendile saadetava hoiatussõnumi algusesse lisatav päis."
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Tähtsus"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr "Scrum ülesanne"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Vaata projekti backlogi"
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-"Projekti liige. Ei kasutata ühegi arvutuse jaoks vaid puhtalt informatiivsel "
-"eesmärgil."
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Väga pakiline"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Tagasiulatuv sprint"
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Sprindi nimi"
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-"Eeldatav ajakulu ülesande tegemiseks. Enamasti seatakse projektihalduri "
-"poolt, kui ülesanne on mustandi olekus."
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Märkused"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Toodete Backlog"
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-"Kui sa märgid selle välja siis projektihaldur saab päringu iga kord, kui "
-"ülesanne on lõpetatud tema meeskonna poolt."
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Tühistatud"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Tiimi nimi"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr "Kirja päis"
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Sprindi päevad"
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Lõppkuupäev"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Arvutatud kasutades ülesandel tehtud töö summat."
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-"Kui sa märgid selle siis avaneb kasutajal hüpikaken ülesande sulgemisel, mis "
-"pakub e-kirja saatmist kliendile."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Vaata sprindi ülesandeid"
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Analüütiline konto"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Kõik ülesanded"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Tähtaeg"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Planeeritud tunnid"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "Mall"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Prioriteet"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Olek"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-"Suletud ülesannete protsent kõigi tegemist vajavate ülesannete hulgast."
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr "Projekti sisemine kirjeldus"
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr "Päevane scrum"
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Arvutuskäik: kulutatud aeg + järelejäänud aeg"
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Liik"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr "Scrum andmed"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Keskmine"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "Aeg kokku"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr "Planeeritud aeg"
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tänased ülessanded"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Ülesanded alates eilsest"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Alguskuupäev"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Projektid"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Ülesande üksikasjad"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Vaata projekti ülesandeid"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr "Edasilükkumise tunnid"
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr "Scrum ülesanded"
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Koosoleku kuupäev"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Ülesanded"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr "Tagasiulatuv"
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Loo ülesandeid"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "Edenemine (%)"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Arvutuskäik: kulutatud aeg / aeg kokku."
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr "On scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr "Mustan backlogid"
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint Backlog"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "Avatud ülesanded"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Kohatud tõkked"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr "Valikuline info"
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr "Selle projektiga seotud ülesannete kogusumma tundides."
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum sprint"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Ülevaade"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr "Minu avatud sprindid (Scrum meister)"
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Märkus"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Mustand"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Madal"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Minu avatud ülesanded"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr "Projektihaldur"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "Lahtine"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr "Kas on midagi, mis sind blokeerib?"
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Staatus"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr "Avatud sprindid"
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "Kulutatud aeg"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "Projekti nimi"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Toote omanik"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr "Minu sprindid (Scrum valdaja)"
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Toodete backlog"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr "Backlogid"
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Kasutaja"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Aktiivne"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-"Arvutuskäik: aeg kokku - eeldatud aeg. See annab projektihalduri pool "
-"eeldatud aja ja tegelikult ülesande sulgemiseks kulunud aja vahe."
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr "Ajalahter"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr "Mustand sprindid"
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "Tööaeg"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "Töö tehtud"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Vaata sprint backlog'i"
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "Delegeeritud kellele:"
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Sulgemise kuupäev"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Omistatud"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Backlog täpne"
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr "Kõigi selle projektiga seotud ülesannetele kulunud aeg."
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"Kui sul on [?] projekti nimes siis tähendab see, et projektiga pole seotud "
-"ühtegi analüütilist kontot."
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr "Kõigi selle projektiga seotud ülesannetele planeeritud aeg."
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr "Hoiata partnerit"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr "Minu sprindid (Toote omanik)"
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "Ülesande kokkuvõte"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-"Seo see see projekt analüütilise kontoga, kui sa vajad finantshaldust "
-"projektidele. See võimaldab sul ühendada projekte eelarvetega, "
-"planeerimisega, kulu ja tulu analüüsidega, tööajalehtedega jms."
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Tehtud"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Loobu"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Avatud"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Ehfektiivsed tunnid"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr "Hoiata haldajat"
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "Töös"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Sprindi ülevaade"
-
-#. module: 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: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Järelejäänud tunnid"
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "Ülemülesanne"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Omadus"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Väga madal"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "Ajatabeli töötunnid, et kohandada gantt diagrammaruannet"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr "Tehtud sprindid"
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr "Backlog ülesanne"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Planeeritud tunnid"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "Muuda Projekte"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr "Scrum koosolek"
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Kirjeldus"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Kiireloomuline"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Koosolekute päevakava"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "Millega sa töötad täna ?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr "Töös"
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Käimas (0-100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr "Scrum meeskond"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr "Scrum projekt"
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "Ülemprojekt"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Sprindi info"
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum meister"
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Ülesanded detailselt"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr "Kulutatud tunnid"
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Kontekst"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr "Tunnid kokku"
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Kasutajad"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Jada"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Ülesande sulgemisel kliendile saadetava hoiatussõnumi algusesse lisatav "
-"jalus."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr "Avatud backlogid"
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Loodud ülesanded"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr "Viga! Sa ei saa luua rekursiivseid projekte."
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Kellele määratud"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr "Eeldatav lõpp"
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr "Kirja jalus"
diff --git a/addons/scrum/i18n/fr.po b/addons/scrum/i18n/fr.po
deleted file mode 100644
index 95b757da770..00000000000
--- a/addons/scrum/i18n/fr.po
+++ /dev/null
@@ -1,917 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"PO-Revision-Date: 2010-05-22 09:49+0000\n"
-"Last-Translator: Christophe Chauvet - http://www.syleam.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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr "Retard du Produit Scrum"
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Nom du Rendez-vous"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr "Créer une tâche à partir du référentiel"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Mes Tâches"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr "Mes Sprints Ouverts (Directeur de Produit)"
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Créer une tâche à partir des référentiels"
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de modèle invalide pour la définition de l'action"
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr "Scrum, méthode de développement agile"
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Progression"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-"Le temps restant total peut être réévalué périodiquement par le prescripteur "
-"de la tâche."
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Sous-projet"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr "Qu'avez vous accompli depuis hier ?"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr "Est-ce que l'estimation du Retard du Sprint est correcte ?"
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr "Membres du projet"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr "Projets Scrum"
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Tâches déléguées"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"L'entête est ajouté au début de l'email pour que le message d'avertissement "
-"soit envoyer au client lorsque la tâche est fermé."
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Importance"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr "Tâche Scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Voir le Retard du Projet"
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-"Membre du projet. Non utilisé dans aucun calcul, juste proposer à titre "
-"d'information"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Très urgent"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Retrospective du Sprint"
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nom du Sprint"
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-"Temps estimé pour réaliser la tâche, habituellement fixé par le responsable "
-"du projet quand la tâche est à l'état brouillon"
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Notes"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Retard du Produit"
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Projet"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-"Si vous cochez ce champs, le responsable du projet recevra une requête "
-"chaque fois qu'une tâche est completé par son équipe."
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Annulé"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Nom de l'équipe"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr "En-tête de courrier"
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Jours du Sprint"
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Date de fin"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Calculé en utilisant la somme du travail de tâche effectuée."
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-"Si vous cochez la case, l'utilisateur verra un menu surgissant quand une "
-"tâche sera fermé proposant un message pour envoyer un mail au client."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Voir les Tâches du Sprint"
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Compte analytique"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Toutes les tâches"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Date limite"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "Partenaire"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Heures planifiés"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "Modèle"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Priorité"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "État"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-"Pourcentage des tâches fermés en accord avec le total des tâches à faire."
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr "Description interne du projet"
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr "Scrum Journalier"
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Calculer comme: Temps passé + Temps restant"
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Type"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr "Données Scrum"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Moyenne"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "Temps Total"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tâches pour aujourd'hui"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Tâches depuis hier"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Date de début"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Projets"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Détails de la tâche"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Voir les tâches du projet"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr "Delais en heures"
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Contact"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr "Tâches Scrum"
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Date du rendez-vous"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Tâches"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr "Rétrospective"
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Créer tâches"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "Progression (%)"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculer comme: Temps passé / Temps total"
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr "Est Scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr "Retards Brouillon"
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Retard du Sprint"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "Tâches ouvertes"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Blocages rencontrés"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr "Info optionelle"
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Sprint Scrum"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Critique"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr "Mes Sprints Ouverts (Maître Scrum)"
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Note"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Brouillon"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Faible"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Mes Tâches Ouvertes"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr "Responsable du projet"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "En attente"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr "Est-ce que quelque chose vous bloque ?"
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "État"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr "Sprints Ouverts"
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "Temps écoulé"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "Nom du Projet"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Directeur de Produit"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr "Mes Sprints (Maître Scrum)"
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Retard du Produit"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr "Retards"
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Utilisateur"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Actif"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-"Calculer comme: Temps total - Temps estimé. Cela donne la différence de "
-"temps estimé par le responsable projet et le temps réel pour fermer cette "
-"tâche."
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr "Sprints Brouillon"
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "Temps de travail"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "Travail effectué"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Voir les retards du sprint"
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "Déléguer à"
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Date de fin"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Assigné à"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Retard Correct"
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr "Total des heures passés de toutes les tâches reliés à ce projet"
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"Si vous avez [?] dans le nom du projet, cela signifie que vous n'avez pas de "
-"compte analytique lié à ce projet"
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr "Somme des tâches planifiés de toutes les tâches relier à ce projet."
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr "Avertir le partenaire"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr "Mes Sprints (Directeur de Produit)"
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "Résumé de la tâche"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-"Lier ce projet à un compte analytique si vous souhaitez une gestion "
-"financière sur les projets. Il vous active la gestion des projets avec les "
-"budgets, agenda, coût, analyse de revenu, feuilles de temps sur le projet, "
-"etc."
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Terminé"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Ouvert"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Heures effectives"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr "Avertir le responsable"
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "En cours"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Critique du Sprint"
-
-#. module: 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: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "Tâche parente"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Fonctionnalité"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Très basse"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr "Sprints Terminés"
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Heures planifiées"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "Éditer les Projets"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr "Rendez-vous Scrum"
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Description"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Urgent"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Rendez-vous Journaliers"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "Sur quoi travaillez vous aujourd'hui ?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Avancement (0-100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr "Équipe Scrum"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr "Projet Scrum"
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "Project Parent"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Info sur le Sprint"
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum Master"
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Détails des Tâches"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Contexte"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Utilisateurs"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Séquence"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr "Retards Ouverts"
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Tâches Créées"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Attribué à"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/hr.po b/addons/scrum/i18n/hr.po
deleted file mode 100644
index 98e92cfe358..00000000000
--- a/addons/scrum/i18n/hr.po
+++ /dev/null
@@ -1,893 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr ""
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr ""
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/hu.po b/addons/scrum/i18n/hu.po
deleted file mode 100644
index 98e92cfe358..00000000000
--- a/addons/scrum/i18n/hu.po
+++ /dev/null
@@ -1,893 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr ""
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr ""
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/id.po b/addons/scrum/i18n/id.po
deleted file mode 100644
index e6c3d1e9cfb..00000000000
--- a/addons/scrum/i18n/id.po
+++ /dev/null
@@ -1,893 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr ""
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr ""
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/it.po b/addons/scrum/i18n/it.po
deleted file mode 100644
index 09d6bf3e487..00000000000
--- a/addons/scrum/i18n/it.po
+++ /dev/null
@@ -1,895 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr "Lavoro Arretrato"
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Nome Riunione"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Le Mie Attività"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr "I Miei Sprint Aperti (Titolare Prodotto)"
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Avanzamento"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Sottoprogetto"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr "Cosa hai fatto da ieri ?"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr "Sono accurate le tue stime sugli Sprint arretrati ?"
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr "Progetti"
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Attività delegate"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Importanza"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr "Attività Scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Visualizza cronologia progetto"
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Molto Urgente"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Cronologia Sprint"
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nome Sprint"
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Note"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Cronologia Prodotto"
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Progetto"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Annullato"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Nome Team"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Giorni Sprint"
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Data Fine"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Visualizza Attività Sprint"
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Contabilità Analitica"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Tutte le attività"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Scadenza"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Ore pianificate"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Priorità"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Stato"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr "Scrum Giornaliero"
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Medio"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Attività di Oggi"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Attività da Ieri"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Data di inizio"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Progetti"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Dettagli Attività"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Visualizza Attività Progetto"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Contatto"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr "Attività Scrum"
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Data Riunione"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Attività"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr "Cronologia"
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Crea Attività"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr "è Scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr "Bozza Arretrati"
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint Arretrati"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "Attività Aperte"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Ostacoli incontrati"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr "Informazioni Opzionali"
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Sprint Scrum"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Revisione"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr "I Miei Sprint Aperti (Responsabile Scrum)"
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Bozza"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Bassa"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Le Mie Attività Aperte"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "In attesa"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr "Qualcosa di ostacola ?"
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Stato"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr "Sprint Aperti"
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Titolare Prodotto"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr "I Miei Sprint (Responsabile Scrum)"
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Cronologia Prodotto"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr "Cronomogie"
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Utente"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Attivo"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr "Periodo Inderogabile"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr "Bozze Sprint"
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "Lavoro Eseguito"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Visualizza Cronologia Sprint"
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Data di Fine"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Assegnato a"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Cronologia Accurata"
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr "I Miei Sprint (Responsabile Prodotto)"
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "Riassunto Attività"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Completato"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Annulla"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Aperto"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Ore Effettive"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Revisione Sprint"
-
-#. module: 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: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "Attività Superiore"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Caratteristica"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Molto Bassa"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr "Sprint Completato"
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Ore Pianificate"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "Modifica Progetti"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr "Riunione Scrum"
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Descrizione"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Urgente"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Riunione Quotidiana"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "Su cosa lavorerai oggi ?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progresso (0-100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr "Team Scrum"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr "Progetto Scrum"
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "Progetto Superiore"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Informazioni Sprint"
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Responsabile Scrum"
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Dettagli Attività"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Contesto"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Utenti"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Sequenza"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr "Cronologie Aperte"
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Attività Create"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Assegna A"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/ko.po b/addons/scrum/i18n/ko.po
deleted file mode 100644
index 237a2fa455a..00000000000
--- a/addons/scrum/i18n/ko.po
+++ /dev/null
@@ -1,896 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-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"
-"PO-Revision-Date: 2010-04-04 01:39+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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr "상품 백로그 스크럼"
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "미팅 이름"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr "백로그로부터 과제 생성"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "내 과제"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr "내 오픈된 스프린트 (상품 소유자)"
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "백로그로부터 과제 생성"
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "액션 정의에서 유효하지 않은 모델 이름"
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr "스크럼, 애자일 개발 방법"
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "진행"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr "총 남은 시간은 과제 담당자에 의해 주기적으로 재평가될 수 있습니다."
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "하위 프로젝트"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr "어제 이후로 귀하가 성취한 것은 무엇인가요?"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr "귀하의 '스프린트 백로그' 추정이 정확한가요?"
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr "프로젝트 멤버"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr "스크럼 프로젝트"
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "위임된 과제"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr "과제가 마감될 때 고객에게 송달되는 알림 이메일의 앞부분에 추가되는 헤더"
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "중요성"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr "스크럼 과제"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "프로젝트 백로그 보기"
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr "프로젝트 멤버. 계산 목적이 아니라 단지 정보 목적임."
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "매우 긴급"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "스프린트 회고"
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "스프린트 이름"
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr "과제에 소요될 추정 시간으로 보통 과제가 초안 상태일 때 프로젝트 관리자에 의해 설정됨."
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "노트"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "상품 백로그"
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "프로젝트"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr "이 필드를 체크하면, 팀 멤버에 의해 과제가 종료될 때 마다, 프로젝트 관리자가 요청을 접수하게 됩니다."
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "취소됨"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "팀 이름"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr "메일 헤더"
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "스프린트 데이"
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "종료 날짜"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "완료된 과제 작업의 합으로 계산됨."
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr "여기를 체크하면, 과제를 마감할 때마다 고객에게 이메일 전송을 제안하는 팝업 창이 뜹니다."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "스프린트 과제 보기"
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "분석 계정"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "모든 과제"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "마감시한"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "파트너"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "계획된 시간"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "템플릿"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "우선순위"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "상태"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr "해야할 과제의 합계 대비 마감된 과제들의 비율"
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr "프로젝트에 대한 내부 설명"
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr "일간 스크럼"
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr "계산: 소요 시간 + 남은 시간"
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "타입"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr "스크럼 데이터"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "중간"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "총 시간"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr "스크럼"
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr "계획된 시간"
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "오늘 할 일"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "어제 이후 업무"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "시작 날짜"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "프로젝트"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "유효하지 않은 아키텍처를 위한 XML 보기!"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "과제 상세 내용"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "프로젝트 과제 보기"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr "지연 시간"
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "연락"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr "스크럼 과제"
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "미팅 날짜"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "과제"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr "소급성"
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "과제 생성"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "진행 (%)"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "계산: 소요 시간/ 총 시간"
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr "은/는 스크럼입니다."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr "백로그 초안"
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "스프린트 백로그"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "오픈된 과제들"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "장애물 발생"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr "추가 정보"
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr "이 프로젝트에 관련된 모든 과제들의 총 시간 합계"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "스크럼 스프린트"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "검토"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr "내 오픈된 스프린트 (스크럼 마스터)"
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "노트"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "초안"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "낮음"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "내 오픈된 과제들"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr "프로젝트 매니저"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "보류"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr "귀하를 방해하는 무엇이 있습니까?"
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "상태"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr "오픈된 스프린트들"
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "소요 시간"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "프로젝트 이름"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "프로젝트 소유자"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr "내 스프린트 (스크럼 마스터)"
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "상품 백로그"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr "백로그"
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "사용자"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "활성"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr "계산: 총 시간 - 추정 시간. 프로젝트 매니저가 추정한 소요 시간과 실제 과제 마감 시간 간의 차이"
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr "타임박스"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr "스프린트 초안"
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "작업 시간"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "작업 완료"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "스프린트 백로그 보기"
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "위임받은 자"
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "마감된 날짜"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "할당받은 사람"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "백로그 정확성"
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr "이 프로젝트에 관련된 모든 과제에 소요된 시간 합계"
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr "프로젝트 이름 속에 [?]가 있으며, 이 프로젝트에 연결된 분석 계정이 없음을 의미합니다."
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr "이 프로젝트에 관련된 모든 과제의 계획 시간 합계"
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr "파트너에게 알림"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr "나의 스프린트 (상품 소유자)"
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "과제 요약"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-"프로젝트에 대한 재무 관리가 필요하면 이 프로젝트를 분석 계정에 링크하십시오. 예산, 계획, 원가 및 수입 분석, 프로젝트 타임시트 등을 "
-"수행할 수 있습니다."
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "완료"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "취소"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "열기"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "효과적인 시간"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr "매니저에게 알림"
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "진행중"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "스프린트 검토"
-
-#. module: scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "남은 시간"
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "부모 과제"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "특성"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "매우 낮음"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "가트 다이어그램 리포트를 조정하기 위한 작업 시간표"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr "완료된 스프린트"
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr "백로그 과제"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "계획된 시간"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "프로젝트 편집"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr "스크럼 미팅"
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "설명"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "긴급"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "일일 미팅"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "오늘 어떤 일을 하셨습니까?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr "실행 중"
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "진행 (0-100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr "스크럼 팀"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr "스크럼 프로젝트"
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "부모 프로젝트"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr "스프린트 정보"
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "스크럼 마스터"
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "과제 상세 정보"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr "소요 시간"
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "문맥"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr "총 시간"
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "사용자"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "시퀀스"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr "과제가 마감될 때 고객에게 전송되는 알림 메일에 첨부되는 푸터"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr "오픈된 백로그들"
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "생성된 과제들"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr "에러! 자기 참조 프로젝트를 생성할 수는 없습니다."
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "할당받을 이"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr "스프린트"
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr "예상 마감일"
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr "메일 Footer"
diff --git a/addons/scrum/i18n/lt.po b/addons/scrum/i18n/lt.po
deleted file mode 100644
index 98e92cfe358..00000000000
--- a/addons/scrum/i18n/lt.po
+++ /dev/null
@@ -1,893 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr ""
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr ""
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/nl.po b/addons/scrum/i18n/nl.po
deleted file mode 100644
index bc7741790c9..00000000000
--- a/addons/scrum/i18n/nl.po
+++ /dev/null
@@ -1,916 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"PO-Revision-Date: 2009-12-15 15:27+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr "Scrum product backlog"
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Naam vergadering"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr "Maak taak van backlog"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Mijn taken"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr "Mijn geopende sprints (product-eigenaar)"
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Maak taak van backlogs"
-
-#. module: 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: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr "Scrum, agile development method"
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Voortgang"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-"Totaal resterende tijd. Kan periodiek opnieuw worden geschat door de aan "
-"deze taak toegewezen persoon."
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Deelproject"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr "Wat heeft u sinds gisteren gerealiseerd?"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr "Is uw sprint backlog inschatting nauwkeurig?"
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr "Projectleden"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr "Scrum projecten"
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Gedelegeerde taken"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Koptekst die toegevoegd wordt aan het begin van het waarschuwingsbericht dat "
-"per email naar de klant gestuurd wordt wanneer een taak wordt afgesloten."
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Belang"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr "Scrum taak"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Bekijk project backlog"
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr "Projectlid. Niet gebruikt in berekeningen, slechts ter informatie."
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Zeer urgent"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Sprint evaluatie"
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Naam sprint"
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-"Geschatte benodigde tijd om de taak uit te voeren, meestal bepaald door de "
-"projectleider tijdens conceptfase."
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Opmerkingen"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Product backlog"
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Project"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-"Wanneer u dit veld aanvinkt, zal de projectleider een bericht ontvangen "
-"wanneer een taak afgerond is door één van de teamleden."
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Teamnaam"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr "Kopregels mail"
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Sprint dagen"
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Einddatum"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Berekend met de som van het werk dat verricht is."
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-"Als u dit aanvinkt, krijgt de gebruiker een popup als de taak wordt "
-"afgesloten met daarin een voorgesteld bericht dat per email aan de klant kan "
-"worden verzonden."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Bekijk sprint taken"
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Kostenplaats"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Alle taken"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Uiterste opleveringsdatum"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "Relatie"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Geplande uren"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "Sjabloon"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Prioriteit"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Status"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr "Percentage afgesloten taken van het totaal aantal taken."
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr "Interne omschrijving van het project."
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr "Dagelijkse scrum"
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Berekend als: Gebruikte uren + resterende uren."
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Soort"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr "Scrum gegevens"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Gemiddeld"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "Totale tijd"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr "Geplande tijd"
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Taken voor vandaag"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Taken sinds gisteren"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Begindatum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Projecten"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Taakdetails"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Bekijk taken project"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr "Uren vertraging"
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Contactpersoon"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr "Scrum taken"
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Vergaderdatum"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Taken"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr "Evaluatie"
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Maak taken"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "Voortgang (%)"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Berekend als: Gebruikte tijd / totale tijd"
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr "Is Scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr "Concept backlogs"
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint backlog"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "Geopende taken"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Ontdekte blokkades"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr "Optionele info"
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr "Som van de totale uren van alle taken gerelateerd aan dit project"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum sprint"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Evaluatie"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr "Mijn geopende sprints (Scrum meester)"
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Opmerking"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Concept"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Laag"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Mijn geopende taken"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr "Projectleider"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "Wachtend"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr "Is er iets dat u blokkeert?"
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Status"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr "Geopende sprints"
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "Bestede tijd"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "Naam project"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Producteigenaar"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr "Mijn sprints (Scrum meester)"
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Product backlog"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Gebruiker"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Actief"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-"Berekend als: Totale tijd - geschatte tijd. Geeft het verschil tussen de "
-"geschatte tijd van de projectleider en de werkelijke tijd benodigd om de "
-"taak te sluiten."
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr "Timebox"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr "Concept sprints"
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "Werktijd"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "Afgeronde werkzaamheden"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Bekijk sprint backlog"
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "Gedelegeerd aan"
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Datum afgesloten"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Toegewezen aan"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Backlog nauwkeurig"
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr "Totaal van gebruikte uren van alle taken gerelateerd aan dit project"
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"Wanneer er [?] staat in de projectnaam, dan betekend dit dat er geen "
-"kostenplaats gekoppeld is aan dit project."
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr "Totaal van geplande uren van alle taken gerelateerd aan dit project"
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr "Waarschuw relatie"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr "Mijn sprints"
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "Taaksamenvatting"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-"Koppel dit project aan een kostenplaats wanneer u behoefte heeft aan "
-"financieel beheer van projecten. Het geeft u de mogelijkheid om budgetten, "
-"planningen, kosten, opbrengsten, analyses, urenstaten, enz. aan projecten te "
-"verbinden."
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Afgerond"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Open"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Effectieve uren"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr "Waarschuw manager"
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "In behandeling"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Sprint evaluatie"
-
-#. module: 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: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Resterende uren"
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "Hoofdtaak"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Functionaliteit"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Zeer laag"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "Tabel met werkuren om de GANTT overzichten correct weer te geven"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr "Sprints uitgevoerd"
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr "Backlog taken"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Geplande uren"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "Wijzig projecten"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr "Scrum vergadering"
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Omschrijving"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Urgent"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Dagelijkse vergaderingen"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "Waar werkt u vandaag aan?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr "In uitvoering"
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Voortgang (0-100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr "Scrum team"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr "Scrum project"
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "Hoofdproject"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Sprint info"
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum meester"
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Details taak"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr "Gebruikte uren"
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Context"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr "Totale uren"
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Gebruikers"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Reeks"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Voetregels die worden toegevoegd aan het emailbericht waarmee de klant wordt "
-"gewaarschuwd als een taak wordt afgesloten."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr "Geopende backlogs"
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Taken gemaakt"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr "Fout! U kunt geen recursieve projecten definiëren."
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Toewijzen aan"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr "Verwacht einde"
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr "Mail voetregels"
diff --git a/addons/scrum/i18n/nl_BE.po b/addons/scrum/i18n/nl_BE.po
deleted file mode 100644
index 0c8c3890a0b..00000000000
--- a/addons/scrum/i18n/nl_BE.po
+++ /dev/null
@@ -1,894 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr ""
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: 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: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr ""
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/pl.po b/addons/scrum/i18n/pl.po
deleted file mode 100644
index a4295ae2f7b..00000000000
--- a/addons/scrum/i18n/pl.po
+++ /dev/null
@@ -1,905 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"PO-Revision-Date: 2009-12-22 14:18+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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Nazwa spotkania"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Moje zadania"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Postęp"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Podprojekt"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr "Członkowie projektu"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr "Projekty scrum"
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Zadania przekazane"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Ważność"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr "Zadanie Scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr "Członek projektu. Nie stosowane w obliczeniach, tylko do informacji."
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Bardzo pilne"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-"Szacowany czas wykonania zadania. Zwykle ustalany przez menedżera projektu "
-"kiedy zadanie jest w stanie projektu."
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Uwagi"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Anulowano"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Nazwa Zespołu"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Data końcowa"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Konto analityczne"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Wszystkie zadania"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Ostateczny czas ukończenia:"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Planowane godziny"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "Szablon"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Priorytet"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Stan"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr "Wewnętrzny opis projektu"
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Typ"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Średni"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "Czas całkowity"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr "Czas planowany"
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Zadania na dzisiaj"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Zadania od wczoraj"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Data rozpoczęcia"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Projekty"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Szczegóły zadania"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Data spotkania"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Zadania"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Utwórz zadania"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "Postęp (%)"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Obliczone jako: Czas przepracowany / Czas całkowity"
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Przegląd"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Uwaga"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Projekt"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Niski"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Moje otwarte zadania"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr "Menedżer projektu"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "Oczekujący"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Stan"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "Spędzony czas"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "Nazwa projektu"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Właściciel produktu"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Użytkownik"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Aktywne"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-"Obliczone jako: Czas całkowity - Czas szacowany. Jest różnicą pomiędzy "
-"czasem szacowanym przez menedżera projektu, a rzeczywistym czasem do "
-"zamknięcia projektu."
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "Czas pracy"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "Praca wykonana"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "Przekazano"
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Data zamknięcia"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Przypisano do"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-"Suma przepracowanych godzin we wszystkich zadaniach związanych z tym "
-"projektem."
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-"Połącz projekt z kontem analitycznym, jeśli chcesz zarządzać finansowaniem "
-"projektu. To pozwoli ci związać projekt z budżetem, planowaniem, analizą "
-"kosztów i przychodów, kartami czasu pracy itp."
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Wykonano"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Otwarte"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Godziny efektywne"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr "Ostrzeż menedżera"
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "W trakcie przetwarzania"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: 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: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Pozostałe godziny"
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "Zadanie nadrzędne"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Cecha"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Bardzo niski"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Planowane godziny"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "Edytuj projekty"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Pilne"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Spotkania dzienne"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "Nad czym pracujesz dzisiaj ?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr "Uruchomione"
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Postęp (0-100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "Projekt nadrzędny"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Szczegóły zadania"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr "Przepracowane godziny"
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Kontekst"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr "Suma godzin"
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Użytkownicy"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Numeracja"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Utworzone zadania"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych projektów."
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Przypisz do"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr "Spodziewany koniec"
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr "Stopka wiadomości"
diff --git a/addons/scrum/i18n/pt.po b/addons/scrum/i18n/pt.po
deleted file mode 100644
index 2576f968387..00000000000
--- a/addons/scrum/i18n/pt.po
+++ /dev/null
@@ -1,894 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"PO-Revision-Date: 2009-09-08 14:56+0000\n"
-"Last-Translator: neiva.soares@prime.cv <neiva.soares@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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr "Backlog do producto Scrum"
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Nome do encontro"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Minhas tarefas"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr "Meus sprints abertos (Dono do producto)"
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Progresso"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Sub-projecto"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr "Que você realizou desde ontem?"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr "Sua estimativa da reserva de Sprint exata?"
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr "Projectos scrum"
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Tarefas apagadas"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Importância"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr "Tarefas scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Muito urgente"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Retrospectiva do sprint"
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nome do sprint"
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Projecto"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Nome da equipa"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Dias de sprint"
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Data final"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Ver tarefas de sprint"
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Conta da contabilidade analítica"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Todas as tarefas"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Prazo limite"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Horas planeadas"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Prioridade"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Estado"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr "Srum diário"
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Médio"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tarefas para hoje"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Tarefas desde ontem"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Data de início"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Projectos"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Detalhes da tarefa"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Ver tarefas do projecto"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr "Tarefas scrum"
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Data da reunião"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Tarefas"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospectiva"
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Criar tarefas"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr "é scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "Tarefas abertas"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr "Informação opcional"
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Rascunho"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Baixo"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Minhas tarefas abertas"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr "Há algo impedindo você ?"
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Dono do producto"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Utilizador"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr "Timebox"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "Trabalho concluído"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Data de fecho"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Atribuído a"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "Sumário da tarefa"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Aberto"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Horas efectivo"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: scrum
-#: 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: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "Tarefas ascendente"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Muito Baixa"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Horas planeadas"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "Editar projectos"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr "Reunião scrum"
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Descrição"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Urgente"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Mensagens diárias"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "Em quê estas a trabalhar hoje ?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progresso (0 - 100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr "Equipa scrum"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr "Projecto scrum"
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "Projecto ascendente"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "S"
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalhes das tarefas"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Contexto"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Utilizadores"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Sequência"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Traefas criadas"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Designar para"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/pt_BR.po b/addons/scrum/i18n/pt_BR.po
deleted file mode 100644
index 4a0b29045a9..00000000000
--- a/addons/scrum/i18n/pt_BR.po
+++ /dev/null
@@ -1,920 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"PO-Revision-Date: 2010-02-22 19:01+0000\n"
-"Last-Translator: Luiz Fernando M.França <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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr "Backlog de Produto do Scrum"
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Nome da Reunião"
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr "A partir do backlog criar tarefa"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Minhas tarefas"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr "Meus Sprints abertos (Proprietário do Produto)"
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Criar tarefas a partir dos backlogs"
-
-#. module: 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: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr "Método de Desenvolvimento Ágil, Scrum"
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Progresso"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-"Tempo total restante, pode ser re-estimado periodicamente pelo executor da "
-"tarefa"
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Subprojeto"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr "O que você realizou desde ontem?"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr "A sua estimativa do Sprint Backlog está precisa?"
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr "Membros do Projeto"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr "Projetos Scrum"
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr "Tarefas Delegadas"
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Cabeçalho adicionado ao início do email para a mensagem de aviso enviada ao "
-"cliente quando uma tarefa é encerrada."
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Importância"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr "Tarefa Scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Visualizar o backlog do projeto"
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-"Membros do Projeto. Não usado em alguma computação, apenas para a finalidade "
-"da informação."
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Urgentíssimo"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Retrospectiva do Sprint"
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nome do Sprint"
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-"Tempo estimado para efetuar a tarefa, usualmente ajustado pelo gestor do "
-"projeto quando a tarefa está no estado de rascunho"
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Anotações"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Backlog do Produto"
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Projeto"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-"Se marcar este campo, o gestor do projeto receberá uma requisição cada vez "
-"que uma tarefa for completada por este time"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Cancelada"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Nome da equipe"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr "Cabeçalho de Correspondência"
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Dias do Sprint"
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Data Final"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Calculado usando a soma do trabalho realizado da tarefa."
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-"Se selecionado, o usuário vai visualizar uma janela quando fechando uma "
-"tarefa que irá propor que uma mensagem seja enviada por email para o cliente"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Ver Tarefas do Sprint"
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Conta Analítica"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Todas as Tarefas"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Prazo limite"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "Parceiro"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Horas planejadas"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "Modelo"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Prioridade"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Estado"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-"Percentual de tarefas fechadas em relação ao total das tarefas a realizar"
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr "Descrição interna do projeto"
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr "Scrum Diário"
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Calculado como: Tempo Gasto + Tempo Restante"
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr "Dados do Scrum"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Médio"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "Tempo Total"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr "Tempo Planejado"
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tarefas para hoje"
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr "Tarefas desde ontem"
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Data de Início"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Projetos"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para Arquitetura da View"
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Detalhes da Tarefa"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Ver tarefas do projeto"
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr "Horas de Atraso"
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Contato"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr "Tarefas do Scrum"
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Data da Reunião"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Tarefas"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospectiva"
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr "Criar Tarefas"
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "Progresso (%)"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculado como: Tempo Gasto / Tempo Total."
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr "É Scrum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr "Backlogs  Esboçados"
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Backlog do Sprint"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr "Tarefas Abertas"
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Bloqueios encontrados"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr "Informação Opcional"
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-"Soma do total de horas de todas as tarefas relacionadas com este projeto."
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum Sprint"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Rever"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr "Meus sprints abertos"
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Anotação"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Esboço"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Baixo"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr "Minhas tarefas abertas"
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr "Gerente do Projeto"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr "Existe algo lhe bloqueando?"
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr "Sprints Abertos"
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "Tempo Gasto"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "Nome do Projeto"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Proprietário do Produto"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr "Meus Sprints"
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Backlog do Produto"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Usuário"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Ativo"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-"Calculado como: Tempo total - Tempo estimado. Mostra a diferença entre o "
-"tempo estimado pelo responsável do projeto e o tempo real ao fechar a tarefa."
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr "Janela de Tempo"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr "Esboço de Sprints"
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "Tempo Trabalhado"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr "Trabalho concluído"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Ver o backlog do sprint"
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "Delegado para"
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Data de Fechamento"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Atribuída para"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Precisão do Backlog"
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-"Soma das horas gastas em todas as tarefas relacionadas a este projeto"
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"Se existir [?] no nome do projeto, isto significa que não há conta analítica "
-"associada a este projeto."
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-"Soma das horas planejadas para as tarefas relacionadas a este projeto"
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr "Alerte o Parceiro"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr "Meus Sprints"
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "Sumário da tarefa"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-"Associe este projeto a uma conta analítica se precisar gerencia financeira "
-"nos projetos com análise de orçamentos, planejamento, custo e retorno, "
-"planilha de tempo em projetos, etc."
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Horas efetivas"
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr "Avisar o Gestor"
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "Em progresso"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Revisão do Sprint"
-
-#. module: 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 conter nenhum caracter "
-"especial!"
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Horas Restantes"
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr "Tarefa Pai"
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Característica"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Muito Baixa"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "Tabela de horas trabalhadas para ajustar o gráfico de Gantt"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr "Sprints Terminados"
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr "Tarefa de Backlog"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Horas Planejadas"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr "Editar Projetos"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr "Reunião de Scrum"
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Descrição"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Urgente"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Reuniões Diárias"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr "No que você está trabalhando hoje?"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr "Em execução"
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progresso (0-100)"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr "Equipe do Scrum"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr "Projeto Scrum"
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr "Projeto pai"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Informação do Sprint"
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum Master"
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalhes das Tarefas"
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr "Horas Gastas"
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr "Contexto"
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr "Total de Horas"
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Usuários"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Seqüência"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-"Rodapé adicionado no email para a mensagem de aviso envaiada para o cliente "
-"quando a tarefa é encerrada."
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr "Backlogs Abertos"
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr "Tarefas Criadas"
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr "Erro ! Você não pode criar projetos recursivos."
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr "Atribuir para"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr "Término Previsto"
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr "Rodapé de Correspondëncia"
diff --git a/addons/scrum/i18n/ro.po b/addons/scrum/i18n/ro.po
deleted file mode 100644
index 98e92cfe358..00000000000
--- a/addons/scrum/i18n/ro.po
+++ /dev/null
@@ -1,893 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr ""
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr ""
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/scrum.pot b/addons/scrum/i18n/scrum.pot
deleted file mode 100644
index 140d3e7fdfa..00000000000
--- a/addons/scrum/i18n/scrum.pot
+++ /dev/null
@@ -1,872 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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:52+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01: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: \n"
-"Plural-Forms: \n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid "Total remaining time, can be re-estimated periodically by the assignee of the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid "Header added at the beginning of the email for the warning message sent to the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid "Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid "Estimated time to do the task, usually set by the project manager when the task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid "If you check this field, the project manager will receive a request each time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid "If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid "Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid "If you have [?] in the project name, it means there are no analytic account linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr ""
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid "Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr ""
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
-
diff --git a/addons/scrum/i18n/sl.po b/addons/scrum/i18n/sl.po
deleted file mode 100644
index c61e320d782..00000000000
--- a/addons/scrum/i18n/sl.po
+++ /dev/null
@@ -1,894 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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"
-"PO-Revision-Date: 2009-12-10 22:08+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-06-22 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr "Moje naloge"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr "Potek"
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid ""
-"Total remaining time, can be re-estimated periodically by the assignee of "
-"the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr "Podprojekt"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid ""
-"Header added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr "Pomembnost"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr "Zelo nujno"
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid ""
-"Estimated time to do the task, usually set by the project manager when the "
-"task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr "Opombe"
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid ""
-"If you check this field, the project manager will receive a request each "
-"time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr "Preklicano"
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr "Ime ekipe"
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Končni datum"
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid ""
-"If you check this, the user will have a popup when closing a task that "
-"propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr "Analitični konto"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr "Vsa opravila"
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr "Rok"
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr "Načrovane ure"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr "Predloga"
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr "Prioriteta"
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr "Stanje"
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr "Tip"
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr "Srednje"
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr "Skupni čas"
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr "Začetni datum"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr "Projekti"
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr "Podrobnosti opravila"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr "Zamuda v urah"
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr "Stik"
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr "Opravila"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr "Potek (%)"
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr "Pregled"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Opomba"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr "Osnutek"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr "Nizko"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr "Vodja projekta"
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr "Čakajoči"
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr "Stanje"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr "Porabljeni čas"
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr "Ime projekta"
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr "Uporabnik"
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr "Aktivno"
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid ""
-"Computed as: Total Time - Estimated Time. It gives the difference of the "
-"time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr "Delovni čas"
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "Pooblaščen"
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr "Datum zaključka"
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr "Dodeljeno"
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr "Povzetek naloge"
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr "Zaključeno"
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr "Prekliči"
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr "Odpri"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr "V obdelavi"
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: 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: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Preostale ure"
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Možnost"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr "Zelo nizko"
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr "Načrtovane ure"
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr "Nujno"
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr "V teku"
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr "Uporabniki"
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr "Zaporedje"
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid ""
-"Footer added at the beginning of the email for the warning message sent to "
-"the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr ""
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
diff --git a/addons/scrum/i18n/sq.po b/addons/scrum/i18n/sq.po
deleted file mode 100644
index 94d493c7915..00000000000
--- a/addons/scrum/i18n/sq.po
+++ /dev/null
@@ -1,1744 +0,0 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23: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: \n"
-"Plural-Forms: \n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid "Total remaining time, can be re-estimated periodically by the assignee of the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid "Header added at the beginning of the email for the warning message sent to the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid "Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid "Estimated time to do the task, usually set by the project manager when the task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid "If you check this field, the project manager will receive a request each time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid "If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid "Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid "If you have [?] in the project name, it means there are no analytic account linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr ""
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid "Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr ""
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* scrum
-#
-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 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23: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: \n"
-"Plural-Forms: \n"
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Scrum Product backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,note:scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task4
-#: model:ir.ui.menu,name:scrum.menu_action_view_task4
-msgid "My tasks"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
-msgid "My opened sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,note:scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: scrum
-#: model:ir.module.module,shortdesc:scrum.module_meta_information
-msgid "Scrum, Agile Development Method"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,progress_rate:0
-msgid "Progress"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,remaining_hours:0
-msgid "Total remaining time, can be re-estimated periodically by the assignee of the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,child_id:0
-msgid "Subproject"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What have you accomplished since yesterday ?"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,members:0
-msgid "Project Members"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Projects"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,child_ids:0
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_header:0
-msgid "Header added at the beginning of the email for the warning message sent to the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,priority:0
-msgid "Importance"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_task
-msgid "Scrum Task"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,members:0
-msgid "Project's member. Not used in any computation, just for information purpose."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very urgent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,planned_hours:0
-msgid "Estimated time to do the task, usually set by the project manager when the task is in draft state."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,notes:0
-#: field:scrum.task,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_product_backlog
-#: field:scrum.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,project_id:0
-#: field:scrum.task,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_manager:0
-msgid "If you check this field, the project manager will receive a request each time a task is completed by his team."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,name:0
-msgid "Team Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_header:0
-msgid "Mail Header"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_customer:0
-msgid "If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,category_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task
-#: model:ir.ui.menu,name:scrum.menu_action_view_task
-msgid "All Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,partner_id:0
-#: field:scrum.task,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,planned_hours:0
-#: field:scrum.sprint,planned_hours:0
-#: field:scrum.task,planned_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Template"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,priority:0
-msgid "Priority"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,state:0
-#: view:scrum.sprint:0
-msgid "State"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,progress_rate:0
-msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,notes:0
-msgid "Internal description of the project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,meetings_id:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,total_hours:0
-msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,type:0
-msgid "Type"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Medium"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,total_hours:0
-msgid "Total Time"
-msgstr ""
-
-#. module: scrum
-#: model:ir.ui.menu,name:scrum.next_id_67
-msgid "Scrum"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,planned_hours:0
-msgid "Planned Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_yesterday:0
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_start:0
-#: field:scrum.sprint,date_start:0
-#: field:scrum.task,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
-msgid "Projects"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,history:0
-msgid "Task Details"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,tasks:0
-msgid "Scrum Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-msgid "Tasks"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: scrum
-#: wizard_view:scrum.product.backlog.task.create,init:0
-#: wizard_button:scrum.product.backlog.task.create,init,create:0
-msgid "Create Tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,scrum:0
-#: field:scrum.task,scrum:0
-msgid "Is Scrum"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task6
-#: model:ir.ui.menu,name:scrum.menu_action_view_task6
-msgid "Opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Optionnal Info"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,total_hours:0
-msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_sprint
-#: view:scrum.meeting:0
-#: view:scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
-msgid "My opened sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_view_task5
-#: model:ir.ui.menu,name:scrum.menu_tasks_yours
-msgid "My opened tasks"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,manager:0
-msgid "Project Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-#: selection:scrum.task,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "Is there anything blocking you ?"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,state:0
-#: field:scrum.sprint,state:0
-#: field:scrum.task,state:0
-msgid "Status"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
-msgid "Opened Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,effective_hours:0
-msgid "Time Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,complete_name:0
-#: field:scrum.project,name:0
-msgid "Project Name"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,product_owner_id:0
-#: field:scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
-msgid "My Sprints (Scrum Master)"
-msgstr ""
-
-#. module: scrum
-#: model:process.node,name:scrum.process_node_productbacklog0
-#: view:scrum.product.backlog:0
-msgid "Product backlog"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form
-msgid "Backlogs"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,active:0
-#: field:scrum.project,active:0
-#: field:scrum.task,active:0
-msgid "Active"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,delay_hours:0
-msgid "Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,timebox_id:0
-msgid "Timebox"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
-msgid "Draft Sprints"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,timesheet_id:0
-msgid "Working Time"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,user_id:0
-msgid "Assigned to"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,effective_hours:0
-msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.task,project_id:0
-msgid "If you have [?] in the project name, it means there are no analytic account linked to this project."
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,planned_hours:0
-msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
-msgid "My Sprints (Product Owner)"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,category_id:0
-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 and revenue analysis, timesheets on projects, etc."
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.project,state:0
-#: selection:scrum.sprint,state:0
-#: selection:scrum.task,state:0
-msgid "Done"
-msgstr ""
-
-#. module: scrum
-#: wizard_button:scrum.product.backlog.task.create,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,state:0
-#: selection:scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: field:scrum.product.backlog,effective_hours:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-#: field:scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_manager:0
-msgid "Warn Manager"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.task,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#. module: scrum
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,parent_id:0
-msgid "Parent Task"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Very Low"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,timesheet_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
-msgid "Sprints Done"
-msgstr ""
-
-#. module: scrum
-#: model:process.transition,name:scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.product.backlog:0
-#: view:scrum.project:0
-#: view:scrum.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_scrum_project_form
-#: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
-msgid "Edit Projects"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_meeting_form
-#: model:ir.model,name:scrum.model_scrum_meeting
-#: model:ir.ui.menu,name:scrum.menu_action_meeting_form
-#: view:scrum.meeting:0
-msgid "Scrum Meeting"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,description:0
-msgid "Description"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.product.backlog,priority:0
-#: selection:scrum.task,priority:0
-msgid "Urgent"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.meeting:0
-msgid "What are you working on today ?"
-msgstr ""
-
-#. module: scrum
-#: selection:scrum.project,state:0
-msgid "Running"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,progress:0
-#: field:scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_team
-msgid "Scrum Team"
-msgstr ""
-
-#. module: scrum
-#: model:ir.model,name:scrum.model_scrum_project
-#: field:scrum.product.backlog,project_id:0
-msgid "Scrum Project"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,parent_id:0
-msgid "Parent project"
-msgstr ""
-
-#. module: scrum
-#: view:scrum.sprint:0
-msgid "Sprint Info"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,effective_hours:0
-msgid "Hours Spent"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,context_id:0
-msgid "Context"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.task,total_hours:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.team,users_id:0
-msgid "Users"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.product.backlog,sequence:0
-#: field:scrum.project,priority:0
-#: field:scrum.task,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: scrum
-#: help:scrum.project,warn_footer:0
-msgid "Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
-#: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
-msgid "Opened Backlogs"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
-msgid "Created tasks"
-msgstr ""
-
-#. module: scrum
-#: constraint:scrum.project:0
-msgid "Error ! You can not create recursive projects."
-msgstr ""
-
-#. module: scrum
-#: wizard_field:scrum.product.backlog.task.create,init,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: scrum
-#: model:ir.actions.act_window,name:scrum.action_sprint_form
-#: model:ir.ui.menu,name:scrum.menu_action_sprint_form
-#: field:scrum.meeting,sprint_id:0
-#: field:scrum.product.backlog,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,date_end:0
-msgid "Expected End"
-msgstr ""
-
-#. module: scrum
-#: field:scrum.project,warn_footer:0
-msgid "Mail Footer"
-msgstr ""
-
diff --git a/addons/scrum/security/ir.model.access.csv b/addons/scrum/security/ir.model.access.csv
deleted file mode 100644
index 76ba229e952..00000000000
--- a/addons/scrum/security/ir.model.access.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_scrum_sprint","scrum.sprint","model_scrum_sprint","project.group_project_user",1,0,0,0
-"access_scrum_product_backlog","scrum.product.backlog","model_scrum_product_backlog","project.group_project_user",1,1,1,1
-"access_scrum_meeting","scrum.meeting","model_scrum_meeting","project.group_project_user",1,0,0,0
-"access_scrum_meeting_manager","scrum.meeting.manager","model_scrum_meeting","project.group_project_manager",1,1,1,1
-"access_scrum_sprint_manager","scrum.sprint.manager","model_scrum_sprint","project.group_project_manager",1,1,1,1
-"access_scrum_product_backlog_manager","scrum.product.backlog manager","model_scrum_product_backlog","project.group_project_manager",1,1,1,1
-"access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
-"access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index e6762e91ef2..9dc2a6658d8 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Share Management",
     "version" : "1.1",
     "depends" : ["base"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules',
     "description": """The goal is to implement a generic sharing mechanism, where user of OpenERP
 can share data from OpenERP to their colleagues, customers, or friends.
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index d25698194e6..e4fa7c18080 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Inventory Management",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "description" : """OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations.
 Thanks to the double entry management, the inventory controlling is powerful and flexible:
 * Moves history and planning,
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index e733c9496d8..df33d91a2a3 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -43,8 +43,8 @@
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-		<menuitem icon="terp-graph" id="menu_dashboard_stock" name="Dashboard" sequence="0" parent="stock.next_id_61"/>
+		<menuitem id="menu_dashboard_stock" name="Dashboard" sequence="0" parent="stock.next_id_61"/>
         <menuitem action="open_board_warehouse" icon="terp-graph" id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po
index 7fb4784fc07..6c907fdad24 100644
--- a/addons/stock/i18n/lt.po
+++ b/addons/stock/i18n/lt.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* stock
-#
+# * stock
+# Giedrius Slavinskas <giedrius.slavinskas@gmail.com>, 2010.
 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"
-"PO-Revision-Date: 2009-09-16 17:33+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-07-20 22:20+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-06-22 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: lt\n"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
@@ -24,7 +25,7 @@ msgstr "LIFO"
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr ""
+msgstr "Vietų struktūra, jei fiksuota"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -34,12 +35,12 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_15
 msgid "Sub Products"
-msgstr ""
+msgstr "Vaikiniai produktai"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-account"
-msgstr ""
+msgstr "OpenERP-sąskaita"
 
 #. module: stock
 #: constraint:ir.actions.act_window:0
@@ -60,7 +61,7 @@ msgstr ""
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision"
-msgstr "Atnaujinta"
+msgstr "Revizija"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -70,7 +71,7 @@ msgstr ""
 #. module: stock
 #: rml:lot.location:0
 msgid "Total :"
-msgstr ""
+msgstr "Iš viso:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -81,46 +82,46 @@ msgstr ""
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "UoM"
-msgstr ""
+msgstr "Mat. vnt."
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.return_picking
 msgid "Return packing"
-msgstr ""
+msgstr "Grąžinti važtaraštį"
 
 #. module: stock
 #: field:product.category,property_stock_journal:0
 msgid "Stock journal"
-msgstr ""
+msgstr "Atsargų žurnalas"
 
 #. module: stock
 #: wizard_view:stock.fill_inventory,init:0
 msgid "Fill Inventory for specific location"
-msgstr ""
+msgstr "Užpildyti inventorių specifinėms vietoms"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 #: view:stock.picking:0
 #: field:stock.picking.move.wizard,picking_id:0
 msgid "Packing list"
-msgstr ""
+msgstr "Važtaraštis"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Amount"
-msgstr ""
+msgstr "Suma"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Received"
-msgstr ""
+msgstr "Produktai gauti"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr ""
+msgstr "Gaunamos prekės"
 
 #. module: stock
 #: field:stock.picking,name:0
@@ -131,7 +132,7 @@ msgstr "Nuoroda"
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,group:0
 msgid "Group by partner"
-msgstr ""
+msgstr "Grupuoti pagal partnerį"
 
 #. module: stock
 #: field:stock.picking,address_id:0
@@ -141,20 +142,20 @@ msgstr "Partneris"
 #. module: stock
 #: help:product.product,track_incoming:0
 msgid "Force to use a Production Lot during receptions"
-msgstr ""
+msgstr "Priverstinai naudoti gamybos partiją registruojant užsakymus"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
 #: field:stock.move,move_history_ids2:0
 msgid "Move History"
-msgstr ""
+msgstr "Perkėlimo istorija"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
 #: field:stock.production.lot.revision,lot_id:0
 #: field:stock.report.prodlots,prodlot_id:0
 msgid "Production lot"
-msgstr ""
+msgstr "Gamybos partija"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -169,7 +170,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "Internal Location"
-msgstr ""
+msgstr "Vidinė vieta"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -184,29 +185,29 @@ msgstr "Būsena"
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
-msgstr ""
+msgstr "Realių atsargų vertė"
 
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
-msgstr ""
+msgstr "Matavimo vnt."
 
 #. module: stock
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
-msgstr ""
+msgstr "Galima rezervuoti"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Make Parcel"
-msgstr ""
+msgstr "Užregistruoti"
 
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "Packing result"
-msgstr ""
+msgstr "Važtaraščio rezultatas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -216,7 +217,7 @@ msgstr ""
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr ""
+msgstr "Išvežimo vieta"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -231,17 +232,17 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-hr"
-msgstr ""
+msgstr "OpenERP-personalas"
 
 #. module: stock
 #: field:stock.location,usage:0
 msgid "Location Type"
-msgstr ""
+msgstr "Vietos tipas"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-purchase"
-msgstr ""
+msgstr "OpenERP-pirkimai"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -256,7 +257,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Sent"
-msgstr ""
+msgstr "Išsiųsti produktai"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -267,7 +268,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
 msgid "Internal Moves"
-msgstr ""
+msgstr "Vidiniai perkėlimai"
 
 #. module: stock
 #: field:stock.move,product_packaging:0
@@ -277,7 +278,7 @@ msgstr "Pakavimas"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Order(Origin)"
-msgstr ""
+msgstr "Užsakymas"
 
 #. module: stock
 #: rml:lot.location:0
@@ -295,7 +296,7 @@ msgstr "Papildoma informacija"
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Kliento grąžinimas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -305,18 +306,18 @@ msgstr ""
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr ""
+msgstr "Atsargų partijos revizija"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Stock location"
-msgstr ""
+msgstr "Vieta"
 
 #. module: stock
 #: field:stock.location,complete_name:0
 #: field:stock.location,name:0
 msgid "Location Name"
-msgstr ""
+msgstr "Vietos pavadinimas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -327,12 +328,12 @@ msgstr ""
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Move Information"
-msgstr ""
+msgstr "Judėjimo informacija"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Unreceived Products"
-msgstr ""
+msgstr "Negauti produktai"
 
 #. module: stock
 #: field:stock.inventory,state:0
@@ -354,23 +355,23 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.move.wizard:0
 msgid "Move Lines"
-msgstr ""
+msgstr "Perkėlimo eilutės"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
 msgid "Include all childs for the location"
-msgstr ""
+msgstr "Įtraukti visas vaikines vietas"
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr ""
+msgstr "Planinių užsakymų vieta"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 msgid "Production Lots"
-msgstr ""
+msgstr "Gamybos partijos"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -380,7 +381,7 @@ msgstr "Gavėjas"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.track_line
 msgid "Track line"
-msgstr ""
+msgstr "Priskirti partiją"
 
 #. module: stock
 #: field:stock.location,child_ids:0
@@ -395,7 +396,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-graph"
-msgstr ""
+msgstr "OpenERP-grafikas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -414,22 +415,22 @@ msgstr "Kiekis"
 #. module: stock
 #: view:stock.picking:0
 msgid "Process Now"
-msgstr ""
+msgstr "Vykdyti dabar"
 
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "Vietos adresas"
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
-msgstr ""
+msgstr "Gamybos partija naudojama sukurti numerių seriją pagamintoms prekėms"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_13
 msgid "Stock Level 1"
-msgstr ""
+msgstr "Atsargų lygis 1"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -439,58 +440,58 @@ msgstr ""
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
-msgstr ""
+msgstr "Atvežimo vieta"
 
 #. module: stock
 #: view:res.partner:0
 msgid "Stock Properties"
-msgstr ""
+msgstr "Atsargų ypatybės"
 
 #. module: stock
 #: wizard_button:stock.partial_picking,init,split:0
 msgid "Make Picking"
-msgstr ""
+msgstr "Sukurti važtaraštį"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
 msgid "Procurements"
-msgstr ""
+msgstr "Gavimai"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_3
 msgid "IT Suppliers"
-msgstr ""
+msgstr "IT tiekėjai"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form3
 #: model:ir.ui.menu,name:stock.menu_action_move_form3
 msgid "Draft Moves"
-msgstr ""
+msgstr "Perkėlimų juodraščiai"
 
 #. module: stock
 #: field:report.stock.lines.date,product_id:0
 msgid "Product Id"
-msgstr ""
+msgstr "Produkto Nr."
 
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Pirkimai ir pardavimai"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Sąskaita faktūra klientui"
 
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr ""
+msgstr "Inventorizacijos vieta"
 
 #. module: stock
 #: help:product.product,track_production:0
 msgid "Force to use a Production Lot during production order"
-msgstr ""
+msgstr "Priverstinai naudoti gamybos partiją per gamybos užsakymą"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -504,11 +505,14 @@ msgid ""
 "instead of the default one, as the source location for stock moves generated "
 "when you do an inventory"
 msgstr ""
+"Šiam produktui (šablonui) ši gamybos vieta bus naudojama vietoj numatytos "
+"šaltinio vietos, registruoti atsargų judėjimui, sugeneruotam iš atliekamos "
+"inventorizacijos."
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
 msgid "This account will be used to value the output stock"
-msgstr ""
+msgstr "Sąskaita naudojama registruoti atsargų sumažėjimą."
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -519,23 +523,23 @@ msgstr ""
 #: help:product.category,property_stock_journal:0
 msgid ""
 "This journal will be used for the accounting move generated by stock move"
-msgstr ""
+msgstr "Šis žurnalas bus skirtas registruoti atsargų judėjimo įrašams."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
 #: model:ir.ui.menu,name:stock.menu_picking_calendar_delivery
 msgid "Calendar of Deliveries"
-msgstr ""
+msgstr "Pristatymų kalendorius"
 
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incomming Lots"
-msgstr ""
+msgstr "Sekti atvežamus produktus"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
-msgstr ""
+msgstr "Atsargos pagal vietą"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -545,12 +549,12 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by production lots"
-msgstr ""
+msgstr "Atsargų ataskaita pagal produkcijos partijas"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
 msgid "Virtual Stock"
-msgstr ""
+msgstr "Virtualios atsargos"
 
 #. module: stock
 #: selection:stock.location,usage:0
@@ -565,12 +569,12 @@ msgstr ""
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Kairė"
 
 #. module: stock
 #: field:report.stock.lines.date,create_date:0
 msgid "Latest Date of Inventory"
-msgstr ""
+msgstr "Paskutinė inventorizacijos data"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -586,12 +590,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_picking_form
 #: model:ir.ui.menu,name:stock.menu_action_picking_form
 msgid "New Reception Packing"
-msgstr ""
+msgstr "Naujas važtaraštis"
 
 #. module: stock
-#: wizard_field:stock.move.track,init,quantity:0
+#: wizard_field:mrp.stock.move.track,init,quantity:0
 msgid "Quantity per lot"
-msgstr ""
+msgstr "Kiekis Partijoje"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form2
@@ -599,17 +603,17 @@ msgstr ""
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Atsargų judėjimas"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
-msgstr ""
+msgstr "Gamybos vieta"
 
 #. module: stock
 #: field:stock.move,tracking_id:0
 msgid "Tracking Lot"
-msgstr ""
+msgstr "Sekti Partija"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -639,17 +643,17 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
-msgstr ""
+msgstr "Rankinės operacijos"
 
 #. module: stock
 #: field:stock.picking,date_done:0
 msgid "Date Done"
-msgstr ""
+msgstr "Atlikimo data"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Expected Shipping Date"
-msgstr ""
+msgstr "Tikėtina pristatymo data"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -659,7 +663,7 @@ msgstr ""
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
-msgstr ""
+msgstr "Stebėjimas/Serijos"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -674,18 +678,18 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr ""
+msgstr "Partnerio vietos"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid ""
 "Tracking lot is the code that will be put on the logistical unit/pallet"
-msgstr ""
+msgstr "Partijos kodas, kuris bus įtrauktas į logistikos vienetą / padėklą."
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking Number"
-msgstr ""
+msgstr "Partijų numeriai"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -695,12 +699,12 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-stock"
-msgstr ""
+msgstr "OpenERP-atsargos"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Packing List:"
-msgstr ""
+msgstr "Važtaraščio sąrašas:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -710,37 +714,37 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
-msgstr ""
+msgstr "Kalendorius"
 
 #. module: stock
 #: wizard_field:stock.location.products,init,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Nuo"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "weight"
-msgstr ""
+msgstr "svoris"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Non Assigned Products:"
-msgstr ""
+msgstr "Nepriskirti produktai:"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Invoice Control"
-msgstr ""
+msgstr "Sąskaitų faktūrų kontrolė"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Production lot revisions"
-msgstr ""
+msgstr "Gamybos partijų inventorizacija"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Packing Done"
-msgstr ""
+msgstr "Važtaraštis atliktas"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -754,7 +758,7 @@ msgstr "Laukiama"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree7
 #: model:ir.ui.menu,name:stock.menu_picking_waiting
 msgid "Available Packing"
-msgstr ""
+msgstr "Rezervuoti važtaraščiai"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
@@ -765,7 +769,7 @@ msgstr "Sandėlis"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-report"
-msgstr ""
+msgstr "OpenERP-ataskaita"
 
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,type:0
@@ -775,12 +779,12 @@ msgstr "Tipas"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
 msgid "Generic IT Suppliers"
-msgstr ""
+msgstr "Bendri IT tiekėjai"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 msgid "Location Content (With children)"
-msgstr ""
+msgstr "Vietos turinys (su vaikiniais lygiais)"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -790,7 +794,7 @@ msgstr ""
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
-msgstr ""
+msgstr "Atsargų eilutės nr."
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -807,7 +811,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_picking_all
 #: wizard_field:stock.picking.make,init,pickings:0
 msgid "Packing"
-msgstr ""
+msgstr "Važtaraštis"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -818,7 +822,7 @@ msgstr ""
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr ""
+msgstr "Pirkėjo vieta"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -829,15 +833,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_picking_tree9
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree9
 msgid "New Internal Packing"
-msgstr ""
+msgstr "Nauja vidaus pakuotė"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "General Informations"
-msgstr ""
+msgstr "Bendra informacija"
 
 #. module: stock
+#: code:addons/stock/wizard/wizard_return.py:0
 #: selection:stock.location,chained_location_type:0
+#, python-format
 msgid "None"
 msgstr "Nieko"
 
@@ -846,22 +852,22 @@ msgstr "Nieko"
 #: model:ir.actions.wizard,name:stock.action2
 #: model:ir.actions.wizard,name:stock.action_lot4
 msgid "Downstream traceability"
-msgstr ""
+msgstr "Atsekti žemyn"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Finished products"
-msgstr ""
+msgstr "Pagaminti produktai"
 
 #. module: stock
 #: field:stock.location,location_id:0
 msgid "Parent Location"
-msgstr ""
+msgstr "Tėvinė vieta"
 
 #. module: stock
 #: field:stock.inventory,date:0
 msgid "Date create"
-msgstr ""
+msgstr "Sukūrimo data"
 
 #. module: stock
 #: wizard_button:inventory.merge.stock.zero,init,merge:0
@@ -871,18 +877,18 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 msgid "All Stock Moves"
-msgstr ""
+msgstr "Visi atsargų perkėlimai"
 
 #. module: stock
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Netinkamas XML peržiūros struktūrai!"
 
 #. module: stock
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
-msgstr ""
+msgstr "Tiekėjo vieta"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -897,7 +903,7 @@ msgstr "Skubu"
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
 msgid "This account will be used to value the input stock"
-msgstr ""
+msgstr "Sąskaita naudojama registruoti atsargų padidėjimą."
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -913,17 +919,17 @@ msgstr "Sukūrimo data"
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
-msgstr ""
+msgstr "Siuntimas"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Availability"
-msgstr ""
+msgstr "Atšauktos rezervacijos"
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
-msgstr ""
+msgstr "Sukurti perkėlimai"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -933,13 +939,13 @@ msgstr ""
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
-msgstr ""
+msgstr "Reikia išrašyti s/f"
 
 #. module: stock
 #: view:product.product:0
 #: view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr ""
+msgstr "Kitų vietų ypatybės"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -950,27 +956,27 @@ msgstr ""
 #: view:stock.move:0
 #: field:stock.move,date_planned:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: stock
 #: view:product.product:0
 msgid "Stocks"
-msgstr ""
+msgstr "Sandėliai"
 
 #. module: stock
 #: field:stock.location,allocation_method:0
 msgid "Allocation Method"
-msgstr ""
+msgstr "Paskirstymo metodas"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-administration"
-msgstr ""
+msgstr "OpenERP-administravimas"
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr ""
+msgstr "Atsargų vieta"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -980,7 +986,7 @@ msgstr ""
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "The packing has been successfully made !"
-msgstr ""
+msgstr "Važtaraštis buvo sėkmingai sukurtas!"
 
 #. module: stock
 #: field:stock.move,address_id:0
@@ -992,12 +998,12 @@ msgstr "Pristatymo adresas"
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 msgid "Periodical Inventory"
-msgstr ""
+msgstr "Periodinis inventorizavimas"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-crm"
-msgstr ""
+msgstr "OpenERP-crm"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1013,23 +1019,23 @@ msgstr "Kodas"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-partner"
-msgstr ""
+msgstr "OpenERP-partneriai"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form_draft
 msgid "Draft Periodical Inventories"
-msgstr ""
+msgstr "Periodinių inventorizavimų juordaščiai"
 
 #. module: stock
 #: wizard_button:inventory.merge,init,end:0
 #: wizard_button:inventory.merge.stock.zero,init,end:0
+#: wizard_button:mrp.stock.move.track,init,end:0
 #: wizard_button:stock.fill_inventory,init,end:0
 #: wizard_button:stock.invoice_onshipping,init,end:0
 #: wizard_button:stock.location.products,init,end:0
 #: view:stock.move:0
 #: wizard_button:stock.move.split,init,end:0
-#: wizard_button:stock.move.track,init,end:0
 #: wizard_button:stock.partial_picking,init,end:0
 #: view:stock.picking:0
 #: wizard_button:stock.picking.make,init,end:0
@@ -1042,7 +1048,7 @@ msgstr "Atšaukti"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Split in production lots"
-msgstr ""
+msgstr "Suskirstyti į gamybos partijas"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory
@@ -1050,12 +1056,12 @@ msgstr ""
 #: field:stock.inventory.line,inventory_id:0
 #: selection:stock.location,usage:0
 msgid "Inventory"
-msgstr ""
+msgstr "Inventorius"
 
 #. module: stock
 #: view:product.template:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1070,7 +1076,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_tracking
 msgid "Stock Tracking Lots"
-msgstr ""
+msgstr "Atsargų Partijų Stebėjimas"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -1082,7 +1088,7 @@ msgstr "Vieneto kaina"
 #. module: stock
 #: view:stock.picking:0
 msgid "Process Later"
-msgstr ""
+msgstr "Atidėti"
 
 #. module: stock
 #: help:res.partner,property_stock_supplier:0
@@ -1090,27 +1096,28 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
 msgstr ""
+"Ši vieta bus naudojama kaip šaltinio vieta, atsargoms, gaunamoms iš tiekėjo."
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
-msgstr ""
+msgstr "Savininkas"
 
 #. module: stock
 #: field:stock.location,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Dešinė"
 
 #. module: stock
 #: field:stock.picking,origin:0
 msgid "Origin Reference"
-msgstr ""
+msgstr "Užsakymo nuoroda"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form4
 #: model:ir.ui.menu,name:stock.menu_action_move_form4
 msgid "Available Moves"
-msgstr ""
+msgstr "Rezervuoti perkėlimai"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1120,7 +1127,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr ""
+msgstr "Susijęs važtaraštis"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1133,12 +1140,12 @@ msgstr "Pavadinimas"
 #. module: stock
 #: view:stock.inventory.line:0
 msgid "Stock Inventory Lines"
-msgstr ""
+msgstr "Atsargų eilutės"
 
 #. module: stock
 #: wizard_button:stock.location.products,init,open:0
 msgid "Open Products"
-msgstr ""
+msgstr "Atviri produktai"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -1148,13 +1155,13 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Packing List"
-msgstr ""
+msgstr "Ateinančių važtaraščių eilutės"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 #: field:stock.move,picking_id:0
 msgid "Packing List"
-msgstr ""
+msgstr "Važtaraštis"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1164,28 +1171,28 @@ msgstr ""
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Grąžinimas tiekėjui"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Atsargų judėjimas"
 
 #. module: stock
 #: field:product.category,property_stock_account_output_categ:0
 #: field:product.template,property_stock_account_output:0
 msgid "Stock Output Account"
-msgstr ""
+msgstr "Atsargų sumažėjimo sąskaita"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr ""
+msgstr "Automatinis s/f sukūrimas po pristatymo"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "Stock Location Analysis"
-msgstr ""
+msgstr "Atsargų vietų analizė"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1195,22 +1202,22 @@ msgstr ""
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not from Packing"
-msgstr ""
+msgstr "Ne iš važtaraščio"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Chained Locations"
-msgstr ""
+msgstr "Vietų valdymas"
 
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
 msgid "Inventory loss"
-msgstr "Inventoriaus praradimas"
+msgstr "Atsargų nurašymas"
 
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Ref"
-msgstr ""
+msgstr "Vidinė nuoroda"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1223,9 +1230,9 @@ msgid "STOCK_STOP"
 msgstr ""
 
 #. module: stock
-#: wizard_view:stock.move.track,init:0
+#: wizard_view:mrp.stock.move.track,init:0
 msgid "Tracking a move"
-msgstr ""
+msgstr "Judėjimo sekimas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1235,7 +1242,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Validate"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1263,18 +1270,18 @@ msgstr "Pastabos"
 #: field:stock.picking,move_lines:0
 #: field:stock.picking.move.wizard,move_ids:0
 msgid "Move lines"
-msgstr ""
+msgstr "Perkėlimo eilutės"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Value"
-msgstr ""
+msgstr "Reikšmė"
 
 #. module: stock
 #: field:stock.picking,type:0
 msgid "Shipping Type"
-msgstr ""
+msgstr "Pristatymo tipas"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_location_open
@@ -1289,12 +1296,12 @@ msgstr "Pristatymo būdas"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.partial_picking
 msgid "Partial packing"
-msgstr ""
+msgstr "Dalinis važtaraštis"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-calendar"
-msgstr ""
+msgstr "OpenERP-kalendorius"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1309,23 +1316,23 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard
 msgid "Fill From Unreceived Products"
-msgstr ""
+msgstr "Užpildyti iš neatvežtų produktų"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Dest. Move"
-msgstr ""
+msgstr "Tikslo perkėlimas"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_new
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form_new
 msgid "New Periodical Inventory"
-msgstr ""
+msgstr "Naujas periodinis inventorizavimas"
 
 #. module: stock
 #: field:stock.production.lot,revisions:0
 msgid "Revisions"
-msgstr ""
+msgstr "Revizijos"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
@@ -1336,7 +1343,7 @@ msgstr "FIFO"
 #: model:ir.actions.act_window,name:stock.action_picking_tree2_delivery
 #: model:ir.ui.menu,name:stock.menu_picking_waiting_delivery
 msgid "Delivery Orders to Process"
-msgstr ""
+msgstr "Vykdomi pristatymo užsakymai"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -1360,12 +1367,12 @@ msgstr "Vieta"
 #. module: stock
 #: field:stock.picking,invoice_state:0
 msgid "Invoice Status"
-msgstr ""
+msgstr "Sąskaitos faktūros būsena"
 
 #. module: stock
 #: rml:lot.location:0
 msgid "Units"
-msgstr ""
+msgstr "Vienetai"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1375,12 +1382,12 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Cancel Inventory"
-msgstr ""
+msgstr "Atšaukti atsargas"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Future Stock Forecast"
-msgstr ""
+msgstr "Būsimų atsargų prognozė"
 
 #. module: stock
 #: model:ir.module.module,description:stock.module_meta_information
@@ -1403,24 +1410,25 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "Fixed Location"
-msgstr ""
+msgstr "Fiksuota vieta"
 
 #. module: stock
 #: 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: stock
 #: field:stock.picking,min_date:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Suplanuota data"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Siunčiamos prekės"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1430,7 +1438,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_lot_location
 msgid "Lots by location"
-msgstr ""
+msgstr "Partijos pagal vietas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1440,7 +1448,7 @@ msgstr ""
 #. module: stock
 #: model:account.journal,name:stock.stock_journal
 msgid "Stock Journal"
-msgstr ""
+msgstr "Atsargų žurnalas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1450,12 +1458,12 @@ msgstr ""
 #. module: stock
 #: field:stock.production.lot,date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Sukūrimo data"
 
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "Procurement"
-msgstr ""
+msgstr "Planiniai užsakymai"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
@@ -1465,23 +1473,23 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
-msgstr ""
+msgstr "Priverstinai rezervuoti"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "View Stock of Products"
-msgstr ""
+msgstr "Peržiūrėti produktų atsargas"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-mrp"
-msgstr ""
+msgstr "OpenERP-gamyba"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3_delivery
 msgid "Future Delivery Orders"
-msgstr ""
+msgstr "Būsimi pristatymo užsakymai"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1497,17 +1505,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_tracking_form
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form
 msgid "Tracking Lots"
-msgstr ""
+msgstr "Sekti partijas"
 
 #. module: stock
 #: wizard_button:inventory.merge,init,merge:0
 msgid "Yes"
-msgstr ""
+msgstr "Taip"
 
 #. module: stock
 #: field:stock.inventory,inventory_line_id:0
 msgid "Inventories"
-msgstr ""
+msgstr "Atsargos"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1517,50 +1525,50 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PROPERTIES"
-msgstr ""
+msgstr "Atsargų ypatybės"
 
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
-msgstr ""
+msgstr "Tikros atsargos"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_fill_inventory
 #: wizard_view:stock.fill_inventory,init:0
 #: wizard_button:stock.fill_inventory,init,fill_inventory:0
 msgid "Fill Inventory"
-msgstr ""
+msgstr "Užpildyti inventorizaciją"
 
 #. module: stock
 #: wizard_view:stock.invoice_onshipping,init:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Sukurti sąskaitas faktūras"
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
-msgstr ""
+msgstr "Revizijos data"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Lot"
-msgstr ""
+msgstr "Partija"
 
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Set Stock to Zero"
-msgstr ""
+msgstr "Ištrinti atsargas"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
-msgstr ""
+msgstr "Kiekis (Pirkimo mat. vnt.)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree5
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree5
 msgid "Packing to Process"
-msgstr ""
+msgstr "Važtaraščiai laukiantys įvykdymo"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1570,18 +1578,19 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
-msgstr ""
+msgstr "Rezervuoti"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.make_picking
 #: wizard_view:stock.picking.make,init:0
 msgid "Make packing"
-msgstr ""
+msgstr "Sukurti važtaraštį"
 
 #. module: stock
+#: wizard_field:stock.partial_picking,end2,back_order_notification:0
 #: field:stock.picking,backorder_id:0
 msgid "Back Order"
-msgstr ""
+msgstr "Užsakymas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1612,13 +1621,13 @@ msgstr "Savybės"
 #: model:ir.ui.menu,name:stock.menu_action_incoterms_tree
 #: view:stock.incoterms:0
 msgid "Incoterms"
-msgstr ""
+msgstr "Incoterm sąlygos"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Total:"
-msgstr ""
+msgstr "Iš viso:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1631,9 +1640,9 @@ msgid "STOCK_ZOOM_OUT"
 msgstr ""
 
 #. module: stock
-#: wizard_field:stock.move.track,init,tracking_prefix:0
+#: wizard_field:mrp.stock.move.track,init,tracking_prefix:0
 msgid "Tracking prefix"
-msgstr ""
+msgstr "Stebėjimo prefiksas"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
@@ -1643,12 +1652,12 @@ msgstr "Artimiausias"
 #. module: stock
 #: wizard_field:stock.location.products,init,to_date:0
 msgid "To"
-msgstr ""
+msgstr "Iki"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
-msgstr ""
+msgstr "Revizijos pavadinimas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1658,12 +1667,12 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Confirm Inventory"
-msgstr ""
+msgstr "Patvirtinti atsargas"
 
 #. module: stock
 #: view:product.category:0
 msgid "Accounting Stock Properties"
-msgstr ""
+msgstr "Atsargų apskaitos savybės"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1685,7 +1694,7 @@ msgstr "Atlikta"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
-msgstr ""
+msgstr "Virtualios vietos"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1700,7 +1709,7 @@ msgstr ""
 #. module: stock
 #: field:stock.inventory,date_done:0
 msgid "Date done"
-msgstr ""
+msgstr "Atlikimo data"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -1722,22 +1731,23 @@ msgstr "Sandėliai"
 #: help:product.product,track_outgoing:0
 msgid "Force to use a Production Lot during deliveries"
 msgstr ""
+"Priverstinai naudoti gamybos partiją registruojant pristatymo dokumentus"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Split move lines in two"
-msgstr ""
+msgstr "Skelti eilutes"
 
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,journal_id:0
 msgid "Destination Journal"
-msgstr ""
+msgstr "Tikslinis žurnalas"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_production_lot_2_stock_report_prodlots
 #: model:stock.location,name:stock.stock_location_stock
 msgid "Stock"
-msgstr ""
+msgstr "Sandėlys"
 
 #. module: stock
 #: rml:lot.location:0
@@ -1753,17 +1763,17 @@ msgstr "Produktas"
 #. module: stock
 #: wizard_button:stock.return.picking,init,return:0
 msgid "Return"
-msgstr ""
+msgstr "Grąžinti"
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Packing"
-msgstr ""
+msgstr "Automatinis partijų sukūrimas"
 
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr ""
+msgstr "Produkto mat. vnt."
 
 #. module: stock
 #: field:stock.location,posz:0
@@ -1774,18 +1784,18 @@ msgstr "Aukštis (Z)"
 #: field:stock.inventory.line,product_uom:0
 #: field:stock.move,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "Produkto mato vnt."
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Variants"
-msgstr ""
+msgstr "Variantai"
 
 #. module: stock
 #: field:stock.location,posx:0
 msgid "Corridor (X)"
-msgstr ""
+msgstr "Koridorius (X)"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_suppliers
@@ -1800,17 +1810,17 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-tools"
-msgstr ""
+msgstr "OpenERP-įrankiai"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 msgid "Location Overview"
-msgstr ""
+msgstr "Vietos atsargos"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.location_product
 msgid "Products by Location"
-msgstr ""
+msgstr "Produktai pagal vietas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1820,17 +1830,17 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.wizard,name:stock.move_split
 msgid "Split move line"
-msgstr ""
+msgstr "Suskirstyti judėjimo eilutę"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-sale"
-msgstr ""
+msgstr "OpenERP-pardavimai"
 
 #. module: stock
 #: field:stock.production.lot,name:0
 msgid "Serial"
-msgstr "Serijinis"
+msgstr "Serija"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1840,17 +1850,17 @@ msgstr ""
 #. module: stock
 #: field:stock.location,chained_delay:0
 msgid "Chained Delay (days)"
-msgstr ""
+msgstr "Atidėjimas (dienomis)"
 
 #. module: stock
 #: field:stock.move,location_id:0
 msgid "Source Location"
-msgstr ""
+msgstr "Šaltinio vieta"
 
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
-msgstr ""
+msgstr "Apskaitos įrašai"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1860,7 +1870,7 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "Lots"
-msgstr ""
+msgstr "Partijos"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -1870,7 +1880,7 @@ msgstr "Viską vienu metu"
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outging Lots"
-msgstr ""
+msgstr "Sekti išvežamus produktus"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
@@ -1878,7 +1888,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 #: view:report.stock.lines.date:0
 msgid "Dates of Inventories"
-msgstr ""
+msgstr "Inventorizacijos datos"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1893,7 +1903,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr ""
+msgstr "Partijų Atsargos"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1904,28 +1914,36 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
+"Tai naudojama tik tuo atveju, jeigu jūs pasirinkote vietos tipą. Jei "
+"naudosite \"Automatiniai įrašai\", atsargų judėjimas bus patvirtintas "
+"automatiškai. Naudodami \"Rankinės operacijas\", atsargų judėjimas turi būti "
+"patvirtintas darbuotojo. Jei naudosite \"Automatinis s/f sukūrimas po "
+"pristatymo\", tai automatiškai po atsargų pristatymo bus sukuriama sąskaita "
+"faktūra."
 
 #. module: stock
 #: field:stock.location,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Piktograma"
 
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Tracking"
-msgstr ""
+msgstr "Stebėjimas"
 
 #. module: stock
-#: wizard_button:stock.move.track,init,track:0
+#: wizard_button:mrp.stock.move.track,init,track:0
 #: wizard_button:stock.picking.make,init,make:0
 msgid "Ok"
-msgstr ""
+msgstr "Gerai"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
 msgid ""
 "This account will be used, instead of the default one, to value input stock"
 msgstr ""
+"Ši sąskaita naudojama vietoj numatytos, jeigu registruojant važtaraštyje "
+"nenurodyta tikslo vieta."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -1940,17 +1958,17 @@ msgstr ""
 #. module: stock
 #: wizard_view:inventory.merge,init:0
 msgid "Do you want to merge theses inventories ?"
-msgstr ""
+msgstr "Ar Jūs norite apjungti šį inventorių?"
 
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Planned Date"
-msgstr ""
+msgstr "Maksimali suplanuota data"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Posted Inventory"
-msgstr ""
+msgstr "Užpajamuotos atsargos"
 
 #. module: stock
 #: selection:stock.picking,type:0
@@ -1960,7 +1978,7 @@ msgstr "Gaunamos prekės"
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Location"
-msgstr ""
+msgstr "Atsargų vieta"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1971,7 +1989,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree_delivery
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Pristatymo užsakymai"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1984,6 +2002,8 @@ msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
 msgstr ""
+"Ši vieta bus naudojama kaip tikslo vieta atsargoms, kurios perduodamos "
+"pirkėjui."
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -2004,19 +2024,19 @@ msgstr "Patvirtinti"
 #. module: stock
 #: view:stock.picking:0
 msgid "Check Availability"
-msgstr ""
+msgstr "Patikrinti rezervacija"
 
 #. module: stock
 #: wizard_view:inventory.merge,init:0
 #: model:ir.actions.wizard,name:stock.wizard_merge_inventory
 msgid "Merge inventories"
-msgstr ""
+msgstr "Sujungti inventorius"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Stock Locations Structure"
-msgstr ""
+msgstr "Vietų struktūra"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2028,27 +2048,29 @@ msgstr ""
 msgid ""
 "This account will be used, instead of the default one, to value output stock"
 msgstr ""
+"Ši sąskaita naudojama vietoj numatytos, jeigu registruojant važtaraštyje "
+"nenurodyta šaltinio vieta."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm (Do Not Process Now)"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves Tracked"
-msgstr ""
+msgstr "Partijų judėjimas"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr ""
+msgstr "Ataskaitos"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping
 #: wizard_button:stock.invoice_onshipping,init,create_invoice:0
 msgid "Create invoice"
-msgstr ""
+msgstr "Sukurti sąskaitą faktūrą"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2063,7 +2085,7 @@ msgstr "Nustatymai"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-project"
-msgstr ""
+msgstr "OpenERP-projektas"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
@@ -2072,29 +2094,29 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_stock_report_prodlots
 #: view:stock.report.prodlots:0
 msgid "Stock by Lots"
-msgstr ""
+msgstr "Atsargos pagal partiją"
 
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr ""
+msgstr "Automatiškai patvirtinti"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic Move"
-msgstr ""
+msgstr "Automatiniai įrašai"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
 msgid "Virtual Stock Value"
-msgstr ""
+msgstr "Virtualių atsargų vertė"
 
 #. module: stock
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Atšaukta"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2104,7 +2126,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Užpajamuota"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2118,6 +2140,9 @@ msgid ""
 "instead of the default one, as the source location for stock moves generated "
 "by production orders"
 msgstr ""
+"Šiam produktui (šablonui) ši gamybos vieta bus naudojama vietoj numatytos "
+"šaltinio vietos, registruoti atsargų judėjimui, sugeneruotam iš planinių "
+"užsakymų."
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
@@ -2127,7 +2152,7 @@ msgstr "Pridėti"
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Internal"
-msgstr "Vidinis"
+msgstr "Vidinis perdavimas"
 
 #. module: stock
 #: selection:stock.inventory,state:0
@@ -2147,32 +2172,32 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8
 msgid "Confirmed Packing Waiting Availability"
-msgstr ""
+msgstr "Patvirtinti važtaraščiai laukiantys rezervacijos"
 
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
-msgstr ""
+msgstr "Lentynos (Y)"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
 msgid "Set Stock to 0"
-msgstr ""
+msgstr "Ištrinti atsargas"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Localisation"
-msgstr ""
+msgstr "Lokalizacija"
 
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Do you want to set stocks to zero ?"
-msgstr ""
+msgstr "Ar Jūs tikrai norite ištrinti atsargas ?"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Direct Delivery"
-msgstr "Tiesioginis pristatymass"
+msgstr "Tiesioginis pristatymas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2182,17 +2207,17 @@ msgstr ""
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Production Lots"
-msgstr ""
+msgstr "Sekti gaminamus produktus"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Split in Two"
-msgstr ""
+msgstr "Suskaidyti į dvi"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
 msgid "Future Stock Moves"
-msgstr ""
+msgstr "Ateities atsargų judėjimas"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -2201,6 +2226,9 @@ msgid ""
 "instead of the default one, as the source location for stock moves generated "
 "by procurements"
 msgstr ""
+"Šiam produktui (šablonui) ši gamybos vieta bus naudojama vietoj numatytos "
+"šaltinio vietos, registruoti atsargų judėjimui, sugeneruotam gamybos "
+"užsakymu."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking_move_wizard
@@ -2212,23 +2240,23 @@ msgstr ""
 #: field:stock.move,prodlot_id:0
 #: view:stock.production.lot:0
 msgid "Production Lot"
-msgstr ""
+msgstr "Gamybos partija"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_traceability
 #: model:ir.ui.menu,name:stock.next_id_62
 msgid "Traceability"
-msgstr ""
+msgstr "Atsekamumas"
 
 #. module: stock
 #: field:stock.picking,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Užsakymo data"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Tiekėjo sąskaita"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
@@ -2251,54 +2279,54 @@ msgstr "Bendra informacija"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-product"
-msgstr ""
+msgstr "OpenERP-produktas"
 
 #. module: stock
 #: wizard_button:stock.partial_picking,end2,end:0
 msgid "Close"
-msgstr ""
+msgstr "Uždaryta"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Print Item Labels"
-msgstr ""
+msgstr "Spausdinti etiketes"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Moves"
-msgstr ""
+msgstr "Perkėlimai"
 
 #. module: stock
 #: field:stock.move,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
-msgstr ""
+msgstr "Tikslo vieta"
 
 #. module: stock
 #: wizard_button:stock.move.split,init,split:0
 msgid "Split"
-msgstr "Atskirti"
+msgstr "Padalyti"
 
 #. module: stock
 #: field:stock.location,account_id:0
 msgid "Inventory Account"
-msgstr ""
+msgstr "Atsargų sąskaita"
 
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Set Stocks to Zero"
-msgstr ""
+msgstr "Ištrinti atsargas"
 
 #. module: stock
 #: model:stock.location,name:stock.location_production
 #: selection:stock.location,usage:0
 msgid "Production"
-msgstr ""
+msgstr "Gamyba"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_traceability_low
 msgid "Low Level"
-msgstr ""
+msgstr "Prekių knyga"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -2321,18 +2349,18 @@ msgstr "Pristatymas"
 #: model:ir.actions.wizard,name:stock.action4
 #: model:ir.actions.wizard,name:stock.action_lot2
 msgid "Upstream traceability"
-msgstr ""
+msgstr "Atsekti aukštyn"
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
 #: field:product.template,property_stock_account_input:0
 msgid "Stock Input Account"
-msgstr ""
+msgstr "Atsargų padidėjimo sąskaita"
 
 #. module: stock
 #: field:stock.location,chained_location_type:0
 msgid "Chained Location Type"
-msgstr ""
+msgstr "Vietų tipas"
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -2343,12 +2371,12 @@ msgstr "Klientas"
 #: model:ir.actions.act_window,name:stock.action_location_tree_3
 #: model:ir.ui.menu,name:stock.menu_action_location_tree_3
 msgid "Locations' Values"
-msgstr ""
+msgstr "Vietų vertės"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
-msgstr "Išvestis"
+msgstr "Išvėžimas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2358,12 +2386,12 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
 msgid "Inventory line"
-msgstr ""
+msgstr "Atsargų eilutė"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Others info"
-msgstr ""
+msgstr "Kita informacija"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2374,9 +2402,163 @@ msgstr ""
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Move State"
-msgstr ""
+msgstr "Judėjimo būsena"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
-msgstr ""
+msgstr "Fizinės vietos"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Klaida"
+
+#~ msgid "Qty"
+#~ msgstr "Kiekis"
+
+#~ msgid "Stock Management"
+#~ msgstr "Atsargų valdymas"
+
+#, python-format
+#~ msgid "Futur Stock"
+#~ msgstr "Virtualios atsargos"
+
+#, python-format
+#~ msgid "You cannot delete any record!"
+#~ msgstr "Jūs negalite ištrinti įrašo!"
+
+#, python-format
+#~ msgid "Futur Productions"
+#~ msgstr "Produktai ateityje"
+
+#, python-format
+#~ msgid "Futur Receptions"
+#~ msgstr "Ateities užsakymas"
+
+#~ msgid "(Keep empty to open the current situation)"
+#~ msgstr "(Palikite tuščią, norėdami atidaryti dabartinę situaciją)"
+
+#~ msgid "Scheduled Date"
+#~ msgstr "Numatoma data"
+
+#, python-format
+#~ msgid "Futur Deliveries"
+#~ msgstr "Pristatymai ateityje"
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "Naudotojo klaida"
+
+#, python-format
+#~ msgid "You can only delete draft moves."
+#~ msgstr "Jūs galite ištrinti tik juodraščio būsenos įrašus"
+
+#, python-format
+#~ msgid "Invoice state"
+#~ msgstr "Sąskaitos faktūros būsena"
+
+#, python-format
+#~ msgid "Delivered Qty"
+#~ msgstr "Pristatyti kiekiai"
+
+#, python-format
+#~ msgid "Merging is only allowed on draft inventories."
+#~ msgstr "Apjungimas leidžiamas tik juodraščio būsenos atsargoms."
+
+#, python-format
+#~ msgid "Please select at least two inventories."
+#~ msgstr "Prašome pasirinkti bent jau dvi atsargas."
+
+#, python-format
+#~ msgid "You can not remove a lot line !"
+#~ msgstr "Jūs negalite ištrinti partijos eilutės!"
+
+#, python-format
+#~ msgid "Provide the quantities of the returned products."
+#~ msgstr "Nurodo kiekius grąžintų produktų."
+
+#, python-format
+#~ msgid "Received Qty"
+#~ msgstr "Gauti kiekiai"
+
+#, python-format
+#~ msgid "Products: "
+#~ msgstr "Produktai: "
+
+#, python-format
+#~ msgid "P&L Qty"
+#~ msgstr "Kiekis"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Klaida!"
+
+#~ msgid ""
+#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
+#~ "structured stock locations.\n"
+#~ "Thanks to the double entry management, the inventory controlling is powerful "
+#~ "and flexible:\n"
+#~ "* Moves history and planning,\n"
+#~ "* Different inventory methods (FIFO, LIFO, ...)\n"
+#~ "* Stock valuation (standard or average price, ...)\n"
+#~ "* Robustness faced with Inventory differences\n"
+#~ "* Automatic reordering rules (stock level, JIT, ...)\n"
+#~ "* Bar code supported\n"
+#~ "* Rapid detection of mistakes through double entry system\n"
+#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Open ERP atsargų valdymo modulis gali valdyti kelis sandėlius, atsargų "
+#~ "vietas.\n"
+#~ "Dvejybinio įrašo dėka, inventoriaus valdymas yra lankstus:\n"
+#~ "* Judėjimo istorija ir planavimas,\n"
+#~ "* Įvairūs inventorizacijos metodai (FIFO, LIFO, ...)\n"
+#~ "* Atsargų įvertinimas (standartine arba vidutine kaina, ...)\n"
+#~ "* Įvairaus inventoriaus valdymas\n"
+#~ "* Bar kodo palaikymas\n"
+#~ "* Greitas klaidų nustatymas per dvejybinio įrašo sistemą\n"
+#~ "* Atsekamumas (aukštyn / žemyn, gamybos partijų, serijinis numeris, ...)\n"
+#~ "    "
+
+#, python-format
+#~ msgid "No production sequence defined"
+#~ msgstr "Nėra nurodyta gamybos seka"
+
+#, python-format
+#~ msgid "Error, no partner !"
+#~ msgstr "Klaida, nėra nurodytas partneris!"
+
+#, python-format
+#~ msgid ""
+#~ "Please put a partner on the picking list if you want to generate invoice."
+#~ msgstr ""
+#~ "Prašome įdėti partnerį važtaraštyje, jeigu Jūs norite sugeneruoti sąskaitą "
+#~ "faktūrą."
+
+#, python-format
+#~ msgid "Return lines"
+#~ msgstr "Grąžinimo eilutės"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Klaida!"
+
+#, python-format
+#~ msgid "Unplanned Qty"
+#~ msgstr "Nesuplanuoti kiekiai"
+
+#, python-format
+#~ msgid "Futur P&L"
+#~ msgstr "Ateities P/N"
+
+#, python-format
+#~ msgid "to be invoiced"
+#~ msgstr "sąskaitą faktūra bus išrašyta"
+
+#, python-format
+#~ msgid "Produced Qty"
+#~ msgstr "Pagaminti kiekiai"
+
+#, python-format
+#~ msgid "Invoice cannot be created from Packing."
+#~ msgstr "Sąskaita fakūra negali būti sukurta iš važtaraščio."
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 4d12867cbd7..35cb3ea4ea9 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2010-06-14 13:39+0000\n"
-"Last-Translator: Marcel van der Boom (HS-Development BV) <marcel@hsdev.com>\n"
+"PO-Revision-Date: 2010-07-16 15:56+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <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-06-22 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-07-17 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -44,7 +44,7 @@ msgstr "terp-account"
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de definitie van de actie."
+msgstr "Ongeldige modelnaam in de actie-definitie."
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -592,7 +592,7 @@ msgid "New Reception Packing"
 msgstr "Nieuw ontvangstbon aanmaken"
 
 #. module: stock
-#: wizard_field:stock.move.track,init,quantity:0
+#: wizard_field:mrp.stock.move.track,init,quantity:0
 msgid "Quantity per lot"
 msgstr "Aantal per batch"
 
@@ -683,7 +683,7 @@ msgstr "Relatie locaties"
 #: help:stock.move,tracking_id:0
 msgid ""
 "Tracking lot is the code that will be put on the logistical unit/pallet"
-msgstr ""
+msgstr "Lotnummer is de identificatie voor de logistieke eenheid/pallet"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -840,7 +840,9 @@ msgid "General Informations"
 msgstr "Algemene Informatie"
 
 #. module: stock
+#: code:addons/stock/wizard/wizard_return.py:0
 #: selection:stock.location,chained_location_type:0
+#, python-format
 msgid "None"
 msgstr "Geen"
 
@@ -879,7 +881,7 @@ msgstr "Alle voorraadbewegingen"
 #. module: stock
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+msgstr "Ongeldige XML voor weergave!"
 
 #. module: stock
 #: field:res.partner,property_stock_supplier:0
@@ -1028,12 +1030,12 @@ msgstr "Concept periodieke voorraadcontroles"
 #. module: stock
 #: wizard_button:inventory.merge,init,end:0
 #: wizard_button:inventory.merge.stock.zero,init,end:0
+#: wizard_button:mrp.stock.move.track,init,end:0
 #: wizard_button:stock.fill_inventory,init,end:0
 #: wizard_button:stock.invoice_onshipping,init,end:0
 #: wizard_button:stock.location.products,init,end:0
 #: view:stock.move:0
 #: wizard_button:stock.move.split,init,end:0
-#: wizard_button:stock.move.track,init,end:0
 #: wizard_button:stock.partial_picking,init,end:0
 #: view:stock.picking:0
 #: wizard_button:stock.picking.make,init,end:0
@@ -1046,7 +1048,7 @@ msgstr "Annuleer"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Split in production lots"
-msgstr "Splits in productie-eenheden"
+msgstr "Splits in productie-lots"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory
@@ -1228,9 +1230,9 @@ msgid "STOCK_STOP"
 msgstr "STOCK_STOP"
 
 #. module: stock
-#: wizard_view:stock.move.track,init:0
+#: wizard_view:mrp.stock.move.track,init:0
 msgid "Tracking a move"
-msgstr "Volg een voorraadbeweging"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1274,7 +1276,7 @@ msgstr "Transactieregels"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Value"
-msgstr ""
+msgstr "Waarde"
 
 #. module: stock
 #: field:stock.picking,type:0
@@ -1415,7 +1417,7 @@ msgstr "Vaste locatie"
 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 !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: stock
 #: field:stock.picking,min_date:0
@@ -1503,7 +1505,7 @@ msgstr "STOCK_SORT_DESCENDING"
 #: model:ir.actions.act_window,name:stock.action_tracking_form
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form
 msgid "Tracking Lots"
-msgstr "Traceer eenheden"
+msgstr "Traceer lots"
 
 #. module: stock
 #: wizard_button:inventory.merge,init,merge:0
@@ -1585,6 +1587,7 @@ msgid "Make packing"
 msgstr "Maak picking"
 
 #. module: stock
+#: wizard_field:stock.partial_picking,end2,back_order_notification:0
 #: field:stock.picking,backorder_id:0
 msgid "Back Order"
 msgstr "Nalevering"
@@ -1637,9 +1640,9 @@ msgid "STOCK_ZOOM_OUT"
 msgstr "STOCK_ZOOM_OUT"
 
 #. module: stock
-#: wizard_field:stock.move.track,init,tracking_prefix:0
+#: wizard_field:mrp.stock.move.track,init,tracking_prefix:0
 msgid "Tracking prefix"
-msgstr "Volgkengetal"
+msgstr "Traceer voorloper"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
@@ -1922,7 +1925,7 @@ msgid "Tracking"
 msgstr "Traceren"
 
 #. module: stock
-#: wizard_button:stock.move.track,init,track:0
+#: wizard_button:mrp.stock.move.track,init,track:0
 #: wizard_button:stock.picking.make,init,make:0
 msgid "Ok"
 msgstr "Akkoord"
@@ -2400,6 +2403,58 @@ msgstr "Fysieke locaties"
 #~ msgid "Stock Management"
 #~ msgstr "Voorraadbeheer"
 
+#, python-format
+#~ msgid "You cannot delete any record!"
+#~ msgstr "U kunt dit record niet verwijderen!"
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "Gebruikersfout"
+
+#, python-format
+#~ msgid "You can only delete draft moves."
+#~ msgstr "Er kunnen alleen concept-wijzigingen worden verwijderd."
+
+#, python-format
+#~ msgid "Invoice state"
+#~ msgstr "Factuur status"
+
+#, python-format
+#~ msgid "Delivered Qty"
+#~ msgstr "Geleverd aantal"
+
+#, python-format
+#~ msgid "Merging is only allowed on draft inventories."
+#~ msgstr "Samenvoegen is alleen toegestaan vanaf concept-facturen"
+
+#, python-format
+#~ msgid "Please select at least two inventories."
+#~ msgstr "Selecteer tenminste twee inventarisaties"
+
+#, python-format
+#~ msgid "You can not remove a lot line !"
+#~ msgstr "Een eenheidsregel kan niet worden verwijderd!"
+
+#, python-format
+#~ msgid "Provide the quantities of the returned products."
+#~ msgstr "Geeft de aantallen van de geretourneerde producten."
+
+#, python-format
+#~ msgid "Received Qty"
+#~ msgstr "Ontvangen aantal"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Fout"
+
+#, python-format
+#~ msgid "Products: "
+#~ msgstr "Producten: "
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fout!"
+
 #~ msgid ""
 #~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
 #~ "structured stock locations.\n"
@@ -2428,3 +2483,68 @@ msgstr "Fysieke locaties"
 #~ "* Rapid detection of mistakes through double entry system\n"
 #~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
 #~ "    "
+
+#, python-format
+#~ msgid "No production sequence defined"
+#~ msgstr "Geen productievolgorde gedefinieerd"
+
+#, python-format
+#~ msgid "Error, no partner !"
+#~ msgstr "Fout, geen relatie!"
+
+#, python-format
+#~ msgid ""
+#~ "Please put a partner on the picking list if you want to generate invoice."
+#~ msgstr "Selecteer een relatie op een factuur aan te maken."
+
+#, python-format
+#~ msgid "Return lines"
+#~ msgstr "Retour regels"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Fout!"
+
+#, python-format
+#~ msgid "Unplanned Qty"
+#~ msgstr "Niet geplande aantal"
+
+#, python-format
+#~ msgid "to be invoiced"
+#~ msgstr "te factureren"
+
+#, python-format
+#~ msgid "Produced Qty"
+#~ msgstr "Geproduceerd aantal"
+
+#, python-format
+#~ msgid "No product in this location."
+#~ msgstr "Geen producten op deze locatie"
+
+#, python-format
+#~ msgid "Invoice is not created"
+#~ msgstr "Factuur is niet gegenereerd"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Waarschuwing"
+
+#, python-format
+#~ msgid "Message !"
+#~ msgstr "Bericht !"
+
+#, python-format
+#~ msgid "Invoice is already created."
+#~ msgstr "Factuur is reeds gegenereerd"
+
+#, python-format
+#~ msgid "Please select one and only one inventory !"
+#~ msgstr "Selecteer één voorraad locatie"
+
+#, python-format
+#~ msgid "P&L Qty"
+#~ msgstr "Winst&Verlies hoeveelheid"
+
+#, python-format
+#~ msgid "Invoice cannot be created from Packing."
+#~ msgstr "Factuur kan niet worden gegenereerd vanuit Pick-order"
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index d416c439fcf..bddaa6acc65 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2010-06-14 14:56+0000\n"
+"PO-Revision-Date: 2010-07-18 10:18+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-06-22 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -595,7 +595,7 @@ msgid "New Reception Packing"
 msgstr "Nowe przyjęcia zewnętrzne"
 
 #. module: stock
-#: wizard_field:stock.move.track,init,quantity:0
+#: wizard_field:mrp.stock.move.track,init,quantity:0
 msgid "Quantity per lot"
 msgstr "Ilość wg partii"
 
@@ -728,7 +728,7 @@ msgstr "Od"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "weight"
-msgstr ""
+msgstr "waga"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -845,7 +845,9 @@ msgid "General Informations"
 msgstr "Ogólne informacje"
 
 #. module: stock
+#: code:addons/stock/wizard/wizard_return.py:0
 #: selection:stock.location,chained_location_type:0
+#, python-format
 msgid "None"
 msgstr "Brak"
 
@@ -854,7 +856,7 @@ msgstr "Brak"
 #: model:ir.actions.wizard,name:stock.action2
 #: model:ir.actions.wizard,name:stock.action_lot4
 msgid "Downstream traceability"
-msgstr ""
+msgstr "Śledzenie wsteczne"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
@@ -1032,12 +1034,12 @@ msgstr "Projekty okresowych inwentaryzacji"
 #. module: stock
 #: wizard_button:inventory.merge,init,end:0
 #: wizard_button:inventory.merge.stock.zero,init,end:0
+#: wizard_button:mrp.stock.move.track,init,end:0
 #: wizard_button:stock.fill_inventory,init,end:0
 #: wizard_button:stock.invoice_onshipping,init,end:0
 #: wizard_button:stock.location.products,init,end:0
 #: view:stock.move:0
 #: wizard_button:stock.move.split,init,end:0
-#: wizard_button:stock.move.track,init,end:0
 #: wizard_button:stock.partial_picking,init,end:0
 #: view:stock.picking:0
 #: wizard_button:stock.picking.make,init,end:0
@@ -1233,7 +1235,7 @@ msgid "STOCK_STOP"
 msgstr ""
 
 #. module: stock
-#: wizard_view:stock.move.track,init:0
+#: wizard_view:mrp.stock.move.track,init:0
 msgid "Tracking a move"
 msgstr "Śledzenie przesunięcia"
 
@@ -1591,6 +1593,7 @@ msgid "Make packing"
 msgstr "Wykonaj pobranie"
 
 #. module: stock
+#: wizard_field:stock.partial_picking,end2,back_order_notification:0
 #: field:stock.picking,backorder_id:0
 msgid "Back Order"
 msgstr "Pobranie częściowe"
@@ -1643,7 +1646,7 @@ msgid "STOCK_ZOOM_OUT"
 msgstr ""
 
 #. module: stock
-#: wizard_field:stock.move.track,init,tracking_prefix:0
+#: wizard_field:mrp.stock.move.track,init,tracking_prefix:0
 msgid "Tracking prefix"
 msgstr "Prefiks śledzenia"
 
@@ -1934,7 +1937,7 @@ msgid "Tracking"
 msgstr "Śledzenie"
 
 #. module: stock
-#: wizard_button:stock.move.track,init,track:0
+#: wizard_button:mrp.stock.move.track,init,track:0
 #: wizard_button:stock.picking.make,init,make:0
 msgid "Ok"
 msgstr "Ok"
@@ -2352,7 +2355,7 @@ msgstr "Wydanie zewnętrzne"
 #: model:ir.actions.wizard,name:stock.action4
 #: model:ir.actions.wizard,name:stock.action_lot2
 msgid "Upstream traceability"
-msgstr ""
+msgstr "Śledzenie wprzód"
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
@@ -2412,9 +2415,93 @@ msgstr "Stan przesunięcia"
 msgid "Physical Locations"
 msgstr "Strefy fizyczne"
 
+#, python-format
+#~ msgid "You cannot delete any record!"
+#~ msgstr "Nie możesz usunąć żadnego rekordu!"
+
+#, python-format
+#~ msgid "Error, no partner !"
+#~ msgstr "Błąd, brak partnera !"
+
+#, python-format
+#~ msgid "Invoice is not created"
+#~ msgstr "Faktura nie została utworzona"
+
+#, python-format
+#~ msgid "Provide the quantities of the returned products."
+#~ msgstr "Podaj ilości zwróconych produktów"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Błąd"
+
+#, python-format
+#~ msgid "Invoice is already created."
+#~ msgstr "Faktura już została utworzona."
+
+#, python-format
+#~ msgid "Products: "
+#~ msgstr "Produkty: "
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "Błąd!"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Ostrzeżenie"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Błąd !"
+
+#, python-format
+#~ msgid "to be invoiced"
+#~ msgstr "do zafakturowania"
+
 #~ msgid "Stock Management"
 #~ msgstr "Zapasy"
 
+#, python-format
+#~ msgid "No product in this location."
+#~ msgstr "Brak produktów w tej strefie"
+
+#, python-format
+#~ msgid "Invoice state"
+#~ msgstr "Stan faktury"
+
+#, python-format
+#~ msgid "Delivered Qty"
+#~ msgstr "Ilość dostarczona"
+
+#, python-format
+#~ msgid "Please select at least two inventories."
+#~ msgstr "Wybierz co najmniej dwie inwentaryzacje"
+
+#, python-format
+#~ msgid "You can not remove a lot line !"
+#~ msgstr "Nie możesz usuwać pozycji partii !"
+
+#, python-format
+#~ msgid "Received Qty"
+#~ msgstr "Otrzymana ilość"
+
+#, python-format
+#~ msgid "No production sequence defined"
+#~ msgstr "Nie zdefiniowano numeracji produkcji"
+
+#, python-format
+#~ msgid "Message !"
+#~ msgstr "Wiadomość !"
+
+#, python-format
+#~ msgid "Please select one and only one inventory !"
+#~ msgstr "Wybierz tylko jedną inwentaryzację !"
+
+#, python-format
+#~ msgid "Produced Qty"
+#~ msgstr "Ilość wyprodukowana"
+
 #~ msgid ""
 #~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
 #~ "structured stock locations.\n"
@@ -2443,3 +2530,28 @@ msgstr "Strefy fizyczne"
 #~ "* Śledzenie partii (Od dostawcy/Od nabywcy, partie produkcyjne, numery "
 #~ "seryjne, ...)\n"
 #~ "    "
+
+#, python-format
+#~ msgid "You can only delete draft moves."
+#~ msgstr "Możesz usuwać tylko projekty przesunięć"
+
+#, python-format
+#~ msgid "Merging is only allowed on draft inventories."
+#~ msgstr "Łączenie jest dozwolone tylko na projektach inwentaryzacji"
+
+#, python-format
+#~ msgid "Unplanned Qty"
+#~ msgstr "Ilość nieplanowana"
+
+#, python-format
+#~ msgid ""
+#~ "Please put a partner on the picking list if you want to generate invoice."
+#~ msgstr "Podaj partnera do listy pobrań, jeśli chcesz wygenerować fakturę."
+
+#, python-format
+#~ msgid "Invoice cannot be created from Packing."
+#~ msgstr "Nie można utworzyć faktury z listy przesunięć"
+
+#, python-format
+#~ msgid "Return lines"
+#~ msgstr "Pozycje zwrotu"
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index c5392c24a57..cf6665ddd1e 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 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-06 03:59+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-07-17 05:42+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-06-22 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -44,7 +44,7 @@ msgstr "terp-account"
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模型名称。"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -91,19 +91,19 @@ msgstr "退货"
 #. module: stock
 #: field:product.category,property_stock_journal:0
 msgid "Stock journal"
-msgstr "库存分类帐"
+msgstr "库存记录集合"
 
 #. module: stock
 #: wizard_view:stock.fill_inventory,init:0
 msgid "Fill Inventory for specific location"
-msgstr "填写具体库位盘存"
+msgstr "填写库存的具体库位"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 #: view:stock.picking:0
 #: field:stock.picking.move.wizard,picking_id:0
 msgid "Packing list"
-msgstr "分拣单"
+msgstr "装箱单"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -114,13 +114,13 @@ msgstr "金额"
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Received"
-msgstr "已收到的货品"
+msgstr "已收到的产品"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr "入库货品"
+msgstr "接收的产品"
 
 #. module: stock
 #: field:stock.picking,name:0
@@ -131,7 +131,7 @@ msgstr "参照"
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,group:0
 msgid "Group by partner"
-msgstr "按业务伙伴分类"
+msgstr "按业务伙伴分组"
 
 #. module: stock
 #: field:stock.picking,address_id:0
@@ -184,7 +184,7 @@ msgstr "状态"
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
-msgstr "实际库存额"
+msgstr "实际库存值"
 
 #. module: stock
 #: view:stock.move:0
@@ -201,12 +201,12 @@ msgstr "可用"
 #. module: stock
 #: view:stock.move:0
 msgid "Make Parcel"
-msgstr "装箱"
+msgstr "打包"
 
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "Packing result"
-msgstr "包装结果"
+msgstr "装箱单结果"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -272,7 +272,7 @@ msgstr "内部调拨"
 #. module: stock
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr "装箱"
+msgstr "装箱单"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -295,7 +295,7 @@ msgstr "附加信息"
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Refund"
-msgstr "客户退货"
+msgstr "客户退还"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -305,7 +305,7 @@ msgstr "STOCK_FLOPPY"
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr ""
+msgstr "生产批次修订"
 
 #. module: stock
 #: view:stock.location:0
@@ -332,7 +332,7 @@ msgstr "调拨信息"
 #. module: stock
 #: view:stock.picking:0
 msgid "Unreceived Products"
-msgstr "未接收产品"
+msgstr "未接收的产品"
 
 #. module: stock
 #: field:stock.inventory,state:0
@@ -354,12 +354,12 @@ msgstr "STOCK_UNDERLINE"
 #. module: stock
 #: view:stock.picking.move.wizard:0
 msgid "Move Lines"
-msgstr "凭证明细"
+msgstr "调拨明细"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
 msgid "Include all childs for the location"
-msgstr "包括所有库位子项"
+msgstr "包括所有该库位的子库位"
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
@@ -414,7 +414,7 @@ msgstr "数量"
 #. module: stock
 #: view:stock.picking:0
 msgid "Process Now"
-msgstr "现在处理"
+msgstr "立即处理"
 
 #. module: stock
 #: field:stock.location,address_id:0
@@ -449,7 +449,7 @@ msgstr "库存属性"
 #. module: stock
 #: wizard_button:stock.partial_picking,init,split:0
 msgid "Make Picking"
-msgstr "建立领料/提货"
+msgstr "建立装箱单"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
@@ -475,7 +475,7 @@ msgstr "产品ID"
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "销售与采购"
+msgstr "销售&采购"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
@@ -485,7 +485,7 @@ msgstr "客户发票"
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr "盘存库位"
+msgstr "库存库位"
 
 #. module: stock
 #: help:product.product,track_production:0
@@ -503,12 +503,12 @@ msgid ""
 "For the current product (template), this stock location will be used, "
 "instead of the default one, as the source location for stock moves generated "
 "when you do an inventory"
-msgstr "对于当前产品(模板)该库存库位默认作为库存盘点时库存调拨的源库位."
+msgstr "对于当前产品(模板), 这库存库位将作为默认值, 库存盘点时作为库存调拨的源库位."
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
 msgid "This account will be used to value the output stock"
-msgstr "用于记录出库价值科目"
+msgstr "这科目用于记录出库值"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -519,7 +519,7 @@ msgstr "STOCK_ZOOM_FIT"
 #: help:product.category,property_stock_journal:0
 msgid ""
 "This journal will be used for the accounting move generated by stock move"
-msgstr "用于记录库存调拨产生的会计变动."
+msgstr "这记录集合用于库存调拨产生的会计凭证."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
@@ -545,7 +545,7 @@ msgstr "STOCK_SAVE_AS"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by production lots"
-msgstr "库存生产批次报表"
+msgstr "生产批次库存报表"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -586,10 +586,10 @@ msgstr "STOCK_GOTO_BOTTOM"
 #: model:ir.actions.act_window,name:stock.action_picking_form
 #: model:ir.ui.menu,name:stock.menu_action_picking_form
 msgid "New Reception Packing"
-msgstr "新接收的包装"
+msgstr "新接收的装箱单"
 
 #. module: stock
-#: wizard_field:stock.move.track,init,quantity:0
+#: wizard_field:mrp.stock.move.track,init,quantity:0
 msgid "Quantity per lot"
 msgstr "每批次数量"
 
@@ -700,7 +700,7 @@ msgstr "terp-stock"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Packing List:"
-msgstr "包装单:"
+msgstr "装箱单:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -730,7 +730,7 @@ msgstr "未分派的产品"
 #. module: stock
 #: view:stock.picking:0
 msgid "Invoice Control"
-msgstr "发票控制"
+msgstr "发票管理"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
@@ -754,7 +754,7 @@ msgstr "等待中"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree7
 #: model:ir.ui.menu,name:stock.menu_picking_waiting
 msgid "Available Packing"
-msgstr ""
+msgstr "有效的装箱单"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
@@ -780,7 +780,7 @@ msgstr "一般IT供应商"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 msgid "Location Content (With children)"
-msgstr "库存地点（包括子项）"
+msgstr "库位内容(包括子项)"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -807,7 +807,7 @@ msgstr "STOCK_CONNECT"
 #: model:ir.ui.menu,name:stock.menu_action_picking_all
 #: wizard_field:stock.picking.make,init,pickings:0
 msgid "Packing"
-msgstr "装箱"
+msgstr "装箱单"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -818,7 +818,7 @@ msgstr "STOCK_GO_DOWN"
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr "客户存货地点"
+msgstr "客户库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -829,7 +829,7 @@ msgstr "STOCK_OK"
 #: model:ir.actions.act_window,name:stock.action_picking_tree9
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree9
 msgid "New Internal Packing"
-msgstr "新的内部包装"
+msgstr "新的内部装箱单"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -837,7 +837,9 @@ msgid "General Informations"
 msgstr "一般信息"
 
 #. module: stock
+#: code:addons/stock/wizard/wizard_return.py:0
 #: selection:stock.location,chained_location_type:0
+#, python-format
 msgid "None"
 msgstr "空"
 
@@ -876,7 +878,7 @@ msgstr "所有库存调拨"
 #. module: stock
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "描述视图结构的XML文件无效"
+msgstr "无效的视图结构xml文件!"
 
 #. module: stock
 #: field:res.partner,property_stock_supplier:0
@@ -897,7 +899,7 @@ msgstr "紧急"
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
 msgid "This account will be used to value the input stock"
-msgstr "此科目用于记录入库库存金额"
+msgstr "这科目用于记录入库值"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -980,7 +982,7 @@ msgstr "STOCK_APPLY"
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "The packing has been successfully made !"
-msgstr "装箱已完成！"
+msgstr "这装箱单已完成!"
 
 #. module: stock
 #: field:stock.move,address_id:0
@@ -1024,12 +1026,12 @@ msgstr "定期盘存草稿"
 #. module: stock
 #: wizard_button:inventory.merge,init,end:0
 #: wizard_button:inventory.merge.stock.zero,init,end:0
+#: wizard_button:mrp.stock.move.track,init,end:0
 #: wizard_button:stock.fill_inventory,init,end:0
 #: wizard_button:stock.invoice_onshipping,init,end:0
 #: wizard_button:stock.location.products,init,end:0
 #: view:stock.move:0
 #: wizard_button:stock.move.split,init,end:0
-#: wizard_button:stock.move.track,init,end:0
 #: wizard_button:stock.partial_picking,init,end:0
 #: view:stock.picking:0
 #: wizard_button:stock.picking.make,init,end:0
@@ -1089,7 +1091,7 @@ msgstr "稍候处理"
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
-msgstr "默认作为你接收业务伙伴产品的来源库位"
+msgstr "默认作为你接收当前业务伙伴产品的来源库位"
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
@@ -1120,7 +1122,7 @@ msgstr "STOCK_HARDDISK"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "相关领料/提货"
+msgstr "相关的装箱单"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1148,13 +1150,13 @@ msgstr "]"
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Packing List"
-msgstr "接收包装单"
+msgstr "接收的装箱单"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 #: field:stock.move,picking_id:0
 msgid "Packing List"
-msgstr "包装单"
+msgstr "装箱单"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1164,7 +1166,7 @@ msgstr "STOCK_COPY"
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Refund"
-msgstr "供应商退货"
+msgstr "供应商退还"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1195,7 +1197,7 @@ msgstr "STOCK_CDROM"
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not from Packing"
-msgstr "不是来自包装"
+msgstr "不是来自装箱单"
 
 #. module: stock
 #: view:stock.location:0
@@ -1223,7 +1225,7 @@ msgid "STOCK_STOP"
 msgstr "STOCK_STOP"
 
 #. module: stock
-#: wizard_view:stock.move.track,init:0
+#: wizard_view:mrp.stock.move.track,init:0
 msgid "Tracking a move"
 msgstr "跟踪调拨"
 
@@ -1235,7 +1237,7 @@ msgstr "STOCK_FIND_AND_REPLACE"
 #. module: stock
 #: view:stock.picking:0
 msgid "Validate"
-msgstr "审核"
+msgstr "确认"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1284,7 +1286,7 @@ msgstr "产品"
 #. module: stock
 #: field:stock.picking,move_type:0
 msgid "Delivery Method"
-msgstr "运输方式"
+msgstr "送货方式"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.partial_picking
@@ -1399,14 +1401,14 @@ msgid ""
 "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
 "    "
 msgstr ""
-"\"OpenERP库存管理模块可以管理多仓库，多样化结构的仓储地点.\\n\"\n"
-"\"感谢复式记帐管理，存货管理很强大并且灵活:\\n\"\n"
-"\"* 移动历史和规划,\\n\"\n"
-"\"* 不同的库存管理法 (FIFO, LIFO, ...)\\n\"\n"
+"\"库存管理模块可以管理多仓库, 多样化结构的仓储地点.\\n\"\n"
+"\"感谢复式记帐管理, 存货管理很强大并且灵活:\\n\"\n"
+"\"* 调拨历史和计划\\n\"\n"
+"\"* 不同的库存管理法 (先进先出, 先进后出, ...)\\n\"\n"
 "\"* 库存估价 (标准或平均价格, ...)\\n\"\n"
 "\"* 稳健面临盘存差错\\n\"\n"
 "\"* 自动重新订货规则 (库存水平, JIT, ...)\\n\"\n"
-"\"* 支持条形码\\n\"\n"
+"\"* 支持条码\\n\"\n"
 "\"* 通过复式记帐系统快速检测错误\\n\"\n"
 "\"* 可追溯性(向上追溯/向下追溯,产品批次,序列号, ...)\\n\"\n"
 "    "
@@ -1451,7 +1453,7 @@ msgstr "STOCK_DELETE"
 #. module: stock
 #: model:account.journal,name:stock.stock_journal
 msgid "Stock Journal"
-msgstr "库存分类帐"
+msgstr "库存记录集合"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1481,7 +1483,7 @@ msgstr "强制可用"
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "View Stock of Products"
-msgstr "产品库存视图"
+msgstr "查看库存产品"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1571,7 +1573,7 @@ msgstr "数量(销售单位)"
 #: model:ir.actions.act_window,name:stock.action_picking_tree5
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree5
 msgid "Packing to Process"
-msgstr "包装处理"
+msgstr "装箱单处理"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1587,12 +1589,13 @@ msgstr "设为可用"
 #: model:ir.actions.wizard,name:stock.make_picking
 #: wizard_view:stock.picking.make,init:0
 msgid "Make packing"
-msgstr "装箱"
+msgstr "建立装箱单"
 
 #. module: stock
+#: wizard_field:stock.partial_picking,end2,back_order_notification:0
 #: field:stock.picking,backorder_id:0
 msgid "Back Order"
-msgstr "拖欠订单"
+msgstr "订单"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1642,7 +1645,7 @@ msgid "STOCK_ZOOM_OUT"
 msgstr "STOCK_ZOOM_OUT"
 
 #. module: stock
-#: wizard_field:stock.move.track,init,tracking_prefix:0
+#: wizard_field:mrp.stock.move.track,init,tracking_prefix:0
 msgid "Tracking prefix"
 msgstr "跟踪前缀"
 
@@ -1732,7 +1735,7 @@ msgstr "仓库"
 #. module: stock
 #: help:product.product,track_outgoing:0
 msgid "Force to use a Production Lot during deliveries"
-msgstr "出库时指定批次"
+msgstr "送货时指定批次"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1742,7 +1745,7 @@ msgstr "把调拨明细线分为两部分"
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,journal_id:0
 msgid "Destination Journal"
-msgstr "目标分类帐"
+msgstr "目的地记录集合"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_production_lot_2_stock_report_prodlots
@@ -1769,7 +1772,7 @@ msgstr "退回"
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Packing"
-msgstr "自动创建分拣单"
+msgstr "自动装箱单"
 
 #. module: stock
 #: field:stock.move,product_uos:0
@@ -1915,7 +1918,8 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"如果你选择链式库位这是唯一的.'自动调拨'将创建一个库存调拨后当前这个将自动确认.'手动操作'库存调拨需要人手确认.'自动不增加'库位式取代调拨来源."
+"如果你只选择链式库位类型.\n"
+"'自动调拨' 将创建一个库存调拨后将自动确认. '手动操作' 库存调拨需要人手确认. '自动不增加'步骤' 库位将取代调拨源库位."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -1928,7 +1932,7 @@ msgid "Tracking"
 msgstr "跟踪"
 
 #. module: stock
-#: wizard_button:stock.move.track,init,track:0
+#: wizard_button:mrp.stock.move.track,init,track:0
 #: wizard_button:stock.picking.make,init,make:0
 msgid "Ok"
 msgstr "确定"
@@ -1937,7 +1941,7 @@ msgstr "确定"
 #: help:product.template,property_stock_account_input:0
 msgid ""
 "This account will be used, instead of the default one, to value input stock"
-msgstr "默认作为记录入库值科目"
+msgstr "这科目默认作为记录入库值"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -1967,7 +1971,7 @@ msgstr "已登入库存"
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
-msgstr "收货"
+msgstr "获得的货物"
 
 #. module: stock
 #: view:stock.location:0
@@ -1977,7 +1981,7 @@ msgstr "库存库位"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PLAY"
-msgstr "播放"
+msgstr "STOCK_MEDIA_PLAY"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
@@ -1988,7 +1992,7 @@ msgstr "送货单"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OPEN"
-msgstr "打开"
+msgstr "STOCK_OPEN"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -2006,7 +2010,7 @@ msgstr "确定"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PREVIOUS"
-msgstr "前一个"
+msgstr "STOCK_MEDIA_PREVIOUS"
 
 #. module: stock
 #: view:stock.move:0
@@ -2033,7 +2037,7 @@ msgstr "库存库位结构"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DISCONNECT"
-msgstr "分拆"
+msgstr "STOCK_DISCONNECT"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -2044,7 +2048,7 @@ msgstr "默认作为记录出库值科目"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm (Do Not Process Now)"
-msgstr "确认(现在没处理进程)"
+msgstr "确认(现在不处理)"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
@@ -2054,7 +2058,7 @@ msgstr "调拨跟踪"
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr "内部报表"
+msgstr "报表"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping
@@ -2065,7 +2069,7 @@ msgstr "创建发票"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NETWORK"
-msgstr "网络"
+msgstr "STOCK_NETWORK"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -2075,7 +2079,7 @@ msgstr "设置"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-project"
-msgstr "项目"
+msgstr "terp-project"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
@@ -2089,7 +2093,7 @@ msgstr "库存批次"
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr "自动验证"
+msgstr "自动确认"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -2106,12 +2110,12 @@ msgstr "虚拟库存值"
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Canceled"
-msgstr "取消"
+msgstr "已取消"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_LAST"
-msgstr "最后"
+msgstr "STOCK_GOTO_LAST"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -2121,7 +2125,7 @@ msgstr "已开票"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIRECTORY"
-msgstr "目录"
+msgstr "STOCK_DIRECTORY"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -2151,7 +2155,7 @@ msgstr "草稿"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_CENTER"
-msgstr "居中"
+msgstr "STOCK_JUSTIFY_CENTER"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3
@@ -2159,12 +2163,12 @@ msgstr "居中"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8
 msgid "Confirmed Packing Waiting Availability"
-msgstr "确认包装等待可用"
+msgstr "确认装箱单等待可用"
 
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
-msgstr "架子（Y）"
+msgstr "货架(Y)"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
@@ -2189,7 +2193,7 @@ msgstr "直接送货"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REVERT_TO_SAVED"
-msgstr "恢复到保存"
+msgstr "STOCK_REVERT_TO_SAVED"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -2217,7 +2221,7 @@ msgstr "对于当前产品(模板)该库存库位默认作为产品需求的库
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking_move_wizard
 msgid "stock.picking.move.wizard"
-msgstr "库存.领料/提货.调拨.向导"
+msgstr "库存.装箱单.调拨.向导"
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -2253,7 +2257,7 @@ msgstr "库位"
 msgid ""
 "Scheduled date for the movement of the products or real date if the move is "
 "done."
-msgstr "如果调拨完成.产品调拨的预定日期或实际日期"
+msgstr "如果调拨完成. 产品调拨的预定日期或实际日期"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2263,7 +2267,7 @@ msgstr "一般信息"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-product"
-msgstr "产品"
+msgstr "terp-product"
 
 #. module: stock
 #: wizard_button:stock.partial_picking,end2,end:0
@@ -2321,7 +2325,7 @@ msgstr "说明"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDENT"
-msgstr "缩进"
+msgstr "STOCK_INDENT"
 
 #. module: stock
 #: selection:stock.picking,type:0
@@ -2365,7 +2369,7 @@ msgstr "发出"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_RIGHT"
-msgstr "右对齐"
+msgstr "STOCK_JUSTIFY_RIGHT"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
@@ -2380,7 +2384,7 @@ msgstr "其它信息"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_NEXT"
-msgstr "下一个"
+msgstr "STOCK_MEDIA_NEXT"
 
 #. module: stock
 #: view:stock.move:0
@@ -2393,5 +2397,149 @@ msgstr "调拨状态"
 msgid "Physical Locations"
 msgstr "物理库位"
 
+#, python-format
+#~ msgid "You cannot delete any record!"
+#~ msgstr "您不能删除任何记录！"
+
 #~ msgid "Stock Management"
 #~ msgstr "库存管理"
+
+#, python-format
+#~ msgid "No product in this location."
+#~ msgstr "该货位没有产品"
+
+#, python-format
+#~ msgid "Invoice cannot be created from Packing."
+#~ msgstr "不可从装箱单创建发票"
+
+#, python-format
+#~ msgid "You can only delete draft moves."
+#~ msgstr "您只可删除草稿调拨"
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "用户错误"
+
+#, python-format
+#~ msgid "Invoice state"
+#~ msgstr "发票状态"
+
+#, python-format
+#~ msgid "Delivered Qty"
+#~ msgstr "已交货数量"
+
+#, python-format
+#~ msgid "Invoice is not created"
+#~ msgstr "没有创建发票"
+
+#, python-format
+#~ msgid "Please select at least two inventories."
+#~ msgstr "请选择至少2个盘存"
+
+#, python-format
+#~ msgid "Merging is only allowed on draft inventories."
+#~ msgstr "只允许合并草搞盘存"
+
+#, python-format
+#~ msgid "Provide the quantities of the returned products."
+#~ msgstr "输入退货的数量"
+
+#, python-format
+#~ msgid "You can not remove a lot line !"
+#~ msgstr "您不能删除批次线!"
+
+#, python-format
+#~ msgid "Received Qty"
+#~ msgstr "已接收数量"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "错误"
+
+#, python-format
+#~ msgid "Invoice is already created."
+#~ msgstr "发票已创建"
+
+#, python-format
+#~ msgid "Products: "
+#~ msgstr "产品： "
+
+#, python-format
+#~ msgid "P&L Qty"
+#~ msgstr "益损数量"
+
+#, python-format
+#~ msgid "No production sequence defined"
+#~ msgstr "无生产序列定义"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "错误！"
+
+#, python-format
+#~ msgid "Error, no partner !"
+#~ msgstr "错误，无业务伙伴！"
+
+#, python-format
+#~ msgid "Return lines"
+#~ msgstr "退回明细"
+
+#, python-format
+#~ msgid "Message !"
+#~ msgstr "消息！"
+
+#, python-format
+#~ msgid ""
+#~ "Please put a partner on the picking list if you want to generate invoice."
+#~ msgstr "如果想生成发票，请在挑选列表上填写一家业务伙伴。"
+
+#, python-format
+#~ msgid "Error!"
+#~ msgstr "错误！"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "警告"
+
+#, python-format
+#~ msgid "Please select one and only one inventory !"
+#~ msgstr "请选定唯一的盘存"
+
+#, python-format
+#~ msgid "Unplanned Qty"
+#~ msgstr "计划外数量"
+
+#, python-format
+#~ msgid "to be invoiced"
+#~ msgstr "需开发票"
+
+#, python-format
+#~ msgid "Produced Qty"
+#~ msgstr "产品数量"
+
+#~ msgid ""
+#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
+#~ "structured stock locations.\n"
+#~ "Thanks to the double entry management, the inventory controlling is powerful "
+#~ "and flexible:\n"
+#~ "* Moves history and planning,\n"
+#~ "* Different inventory methods (FIFO, LIFO, ...)\n"
+#~ "* Stock valuation (standard or average price, ...)\n"
+#~ "* Robustness faced with Inventory differences\n"
+#~ "* Automatic reordering rules (stock level, JIT, ...)\n"
+#~ "* Bar code supported\n"
+#~ "* Rapid detection of mistakes through double entry system\n"
+#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
+#~ "    "
+#~ msgstr ""
+#~ "系统库存管理模块能管理多仓库多和结构化仓库库位\n"
+#~ "使用复式记录管理提供灵活和强大库存控制:\n"
+#~ "* 调拨历史和计划\n"
+#~ "* 不同的库存管理方法(FIFO, LIFO, ...)\n"
+#~ "* 存货估计(标准和平均估价)\n"
+#~ "* 自动重开单规则(库存级别,jit)\n"
+#~ "* 存货清单不同的鲁棒性\n"
+#~ "* 条码支持\n"
+#~ "* 通过复式录入系统实现快速检测错误\n"
+#~ "* 跟踪能力(上游,下游,产品批号,序列号)\n"
+#~ "    "
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 01214bad6a4..10b7606533f 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
                    <field name="pricelist_id" position="before">
-                       <field name="location_id" context="{'location': self}" domain="[]"/>
+                       <field name="location_id" context="{'location': self}"/>
                        <separator orientation="vertical"/>
                    </field>
             </field>
@@ -62,9 +62,8 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace">
-                    <label string="Cost Price" align="1.0"/>
-                    <group col="2" colspan="1">
-                        <field name="standard_price" readonly="True" nolabel="1"/>
+                    <group col="4" colspan="2">
+                        <field name="standard_price" readonly="True"/>
                         <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
                     </group>
                 </field>
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 677cdfbcfc0..ebd4e0af226 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -150,10 +150,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">[[ picking.sale_id and picking.sale_id.partner_shipping_id and 'Shipping Address :' or removeParentNode('para') ]] </para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] </para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
+          <para style="terp_tblheader_Details">[[ picking.address_id and 'Shipping Address :' or removeParentNode('para') ]] </para>
+          <para style="terp_default_9">[[ (  picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.zip) or '' ]] [[ (picking.address_id and picking.address_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
         </td>
       </tr>
@@ -202,7 +202,7 @@
           <para style="terp_default_Centre_8">[[ picking.origin ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
+          <para style="terp_default_Centre_8">[[ (picking.address_id  and picking.address_id.title) or '' ]] [[ (picking.address_id and  and picking.address_id.name) or '' ]] </para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
@@ -241,7 +241,7 @@
       <font color="white"> </font>
     </para>
     <section>
-      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]]</para>
+      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') or  removeParentNode('section')  ]]</para>
       <blockTable colWidths="257.0,58.0,61.0,46.0,26.0,74.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
@@ -267,10 +267,11 @@
       <para style="terp_default_2">
         <font color="white"> </font>
       </para>
-    </section>
-    <para style="terp_default_5cm_Above_Space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]</para>
+  
+    <para style="terp_default_5cm_Above_Space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('s') ]]</para>
     <para style="terp_default_Bold_9">Non Assigned Products: [[ ( move_lines.state == 'assigned' or move_lines.state == 'done' or move_lines.state == 'confirmed' ) and removeParentNode('para') ]]</para>
     <para style="terp_default_1cm_above_space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]</para>
+  </section>    
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]</para>
       <blockTable colWidths="257.0,57.0,62.0,46.0,26.0,74.0" style="Move_Line_Content_Other_State">
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 38466f14e71..9d269160fb9 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -103,7 +103,7 @@
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended options..."  groups="base.group_extended">
+                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                     <field name="location_id" widget = "selection"/>
                     <field name="location_dest_id"  widget = "selection"/>
                     <separator orientation="vertical"/>
@@ -201,7 +201,7 @@
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended options..."  groups="base.group_extended">
+                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                     <field name="partner_id" context="{'contact_display':'partner'}"/>
                     <field name="prodlot_id"/>
                     <field name="state"/>
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 77910b29fdd..13cdd624cf2 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -90,7 +90,7 @@
                         <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
                     </group>
                     <newline/>
-                	<group expand="0" string="Extended options..." groups="base.group_extended">
+                	<group expand="0" string="Extended Filters..." groups="base.group_extended">
                       <field name="product_id"/>
                       <separator orientation="vertical"/>
                       <field name="type"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 21e4fd8ce46..c46a9210aad 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -536,16 +536,7 @@ class stock_picking(osv.osv):
         if ('name' not in vals) or (vals.get('name')=='/'):
             seq_obj_name =  'stock.picking.' + vals['type']
             vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name)
-        type_list = {
-            'out':_('Picking List'),
-            'in':_('Reception'),
-            'internal': _('Internal Picking'),
-            'delivery': _('Delivery Order')
-        }
         new_id = super(stock_picking, self).create(cr, user, vals, context)
-        if not vals.get('auto_picking', False):
-            message = type_list.get(vals.get('type', False), _('Picking')) + " '" + (vals['name'] or "n/a") + _(" with origin")+" '" + (vals.get('origin') or "n/a") + "' "+ _("is created.")
-            self.log(cr, user, new_id, message)
         return new_id
 
     _columns = {
@@ -626,6 +617,9 @@ class stock_picking(osv.osv):
             for r in picking.move_lines:
                 if r.state == 'draft':
                     todo.append(r.id)
+
+        self.log_picking(cr, uid, ids, context=context)
+
         todo = self.action_explode(cr, uid, todo, context)
         if len(todo):
             self.pool.get('stock.move').action_confirm(cr, uid, todo, context=context)
@@ -710,16 +704,8 @@ class stock_picking(osv.osv):
         """ Changes picking state to assigned.
         @return: True
         """
-        for pick in self.browse(cr, uid, ids, context=context):
-            type_list = {
-                'out':'Picking List',
-                'in':'Reception',
-                'internal': 'Internal picking',
-                'delivery': 'Delivery order'
-            }
-            message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or 'n/a') + "' "+ _("is ready to be processed.")
-            self.log(cr, uid, id, message)
         self.write(cr, uid, ids, {'state': 'assigned'})
+        self.log_picking(cr, uid, ids, context=context)
         return True
 
     def test_finnished(self, cr, uid, ids):
@@ -758,8 +744,7 @@ class stock_picking(osv.osv):
             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'})
-        message = _('Picking') + " '" + pick.name + "' "+_("is cancelled")
-        self.log(cr, uid, id, message)
+        self.log_picking(cr, uid, ids, context=context)
         return True
 
     #
@@ -1190,6 +1175,31 @@ class stock_picking(osv.osv):
 
         return res
 
+    def log_picking(self, cr, uid, ids, context=None):
+        """ This function will create log messages for picking.
+        @param cr: the database cursor
+        @param uid: the current user's ID for security checks,
+        @param ids: List of Picking Ids
+        @param context: A standard dictionary for contextual values
+        """
+        for pick in self.browse(cr, uid, ids, context=context):
+            type_list = {
+                'out':'Picking List',
+                'in':'Reception',
+                'internal': 'Internal picking',
+                'delivery': 'Delivery order'
+            }
+            message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or 'n/a') + "' "
+            state_list = {
+                          'confirmed': "is scheduled for the '" + datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d') + "'.", 
+                          'assigned': 'is ready to process.', 
+                          'cancel': 'is Cancelled.', 
+                          'done': 'is processed.', 
+                          }
+            message += state_list[pick.state]
+            self.log(cr, uid, pick.id, message)
+        return True
+
 stock_picking()
 
 class stock_production_lot(osv.osv):
@@ -1377,7 +1387,7 @@ class stock_move(osv.osv):
         'picking_id': fields.many2one('stock.picking', 'Picking List', select=True),
         'note': fields.text('Notes'),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
-                                  help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
+                                  help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
                                   \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price',
             digits_compute= dp.get_precision('Account')),
@@ -1573,16 +1583,19 @@ class stock_move(osv.osv):
 
         def create_chained_picking(self, cr, uid, moves, context=None):
             new_moves = []
-            res_obj =  self.pool.get('res.company')
+            res_obj = self.pool.get('res.company')
+            picking_obj = self.pool.get('stock.picking')
+            move_obj = self.pool.get('stock.move')
             if context is None:
                 context = {}
             for picking, todo in self._chain_compute(cr, uid, moves, context=context).items():
                 ptype = todo[0][1][5] and todo[0][1][5] or self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
-                pick_name = ''
+                pick_name = picking.name
                 if ptype == 'delivery':
                     pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.delivery')
-                pickid = self.pool.get('stock.picking').create(cr, uid, {
-                    'name': pick_name or picking.name,
+
+                pickid = picking_obj.create(cr, uid, {
+                    'name': pick_name,
                     'origin': str(picking.origin or ''),
                     'type': ptype,
                     'note': picking.note,
@@ -1591,11 +1604,12 @@ class stock_move(osv.osv):
                     'stock_journal_id': todo[0][1][3],
                     'company_id': todo[0][1][4] or res_obj._company_default_get(cr, uid, 'stock.company', context),
                     'address_id': picking.address_id.id,
-
-                    'invoice_state': 'none'
-                })
+                    'invoice_state': 'none',
+                    'date': picking.date,
+                    'sale_id': picking.sale_id.id
+                    })
                 for move, (loc, auto, delay, journal, company_id, ptype) in todo:
-                    new_id = self.pool.get('stock.move').copy(cr, uid, move.id, {
+                    new_id = move_obj.copy(cr, uid, move.id, {
                         'location_id': move.location_dest_id.id,
                         'location_dest_id': loc.id,
                         'date_moved': time.strftime('%Y-%m-%d'),
@@ -1606,7 +1620,7 @@ class stock_move(osv.osv):
                         'date_planned': (datetime.strptime(move.date_planned, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
                         'move_history_ids2': []}
                     )
-                    self.pool.get('stock.move').write(cr, uid, [move.id], {
+                    move_obj.write(cr, uid, [move.id], {
                         'move_dest_id': new_id,
                         'move_history_ids': [(4, new_id)]
                     })
@@ -1843,8 +1857,6 @@ class stock_move(osv.osv):
                         'ref': move.picking_id and move.picking_id.name,
                         })
             
-            message = _('Move line') + " '" + move.name + "' "+ _("is processed.")
-            self.log(cr, uid, move.id, message)
         # This can be removed
         #tracking_lot = False
         #if context:
@@ -1864,9 +1876,7 @@ class stock_move(osv.osv):
         for pick_id in picking_ids:
             wf_service.trg_write(uid, 'stock.picking', pick_id, cr)
 
-        for (id,name) in picking_obj.name_get(cr, uid, picking_ids):
-            message = _('Document') + " '" + name + "' "+ _("is processed.")
-            self.log(cr, uid, id, message)
+        picking_obj.log_picking(cr, uid, picking_ids, context=context)
         return True
 
     def create_account_move(self, cr, uid, move,account_id, account_variation, amount, context=None):
@@ -1939,8 +1949,11 @@ class stock_move(osv.osv):
             new_move = self.copy(cr, uid, move.id, default_val)
             #self.write(cr, uid, [new_move], {'move_history_ids':[(4,move.id)]}) #TODO : to track scrap moves
             res += [new_move]
-            message = _('Product ') + " '" + move.product_id.name + "' "+ _("is scraped with") + " '" + str(move.product_qty) + "' "+ _("quantity.")
+            product_obj = self.pool.get('product.product')
+            for (id, name) in product_obj.name_get(cr, uid, [move.product_id.id]):
+                message = _('Product ') + " '" + name + "' "+ _("is scraped with") + " '" + str(move.product_qty) + "' "+ _("quantity.")
             self.log(cr, uid, move.id, message)
+
         self.action_done(cr, uid, res)
         return res
 
@@ -2067,8 +2080,12 @@ class stock_move(osv.osv):
                     }
 
                     self.write(cr, uid, [move.id], update_val)
-            message = _('Product ') + " '" + move.product_id.name + "' "+ _("is consumed with") + " '" + str(move.product_qty) + "' "+ _("quantity.")
-            self.log(cr, uid, move.id, message)
+
+            product_obj = self.pool.get('product.product')
+            for new_move in self.browse(cr, uid, res, context=context):
+                for (id, name) in product_obj.name_get(cr, uid, [new_move.product_id.id]):
+                    message = _('Product ') + " '" + name + "' "+ _("is consumed with") + " '" + str(new_move.product_qty) + "' "+ _("quantity.")
+                    self.log(cr, uid, new_move.id, message)
         self.action_done(cr, uid, res)
 
         return res
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2f9fe026a61..5980870f89f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -604,7 +604,7 @@
                     <field name="invoice_state"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-go-forward" help="Approve Picking"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the picking.   Do you want to continue?"/>
                 </tree>
             </field>
@@ -714,7 +714,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-apply"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-apply"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -774,7 +774,7 @@
                     <field name="min_date"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Delivery"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-go-forward" help="Approve Delivery"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
                 </tree>
             </field>
@@ -785,7 +785,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Picking list">
-                    <group col="6" colspan="4">
+                    <group col="6" colspan="4" attrs="{'readonly': [('state','not in',['draft','auto'])]}">
                         <field name="name" readonly="1"/>
                         <field name="address_id" required="1"/>
                         <field name="origin"/>
@@ -894,7 +894,6 @@
                             <field name="auto_picking"/>
                             <field name="active"/>
                             <newline/>
-                            <field name="date"/>
                             <field name="date_done"/>
                             <field name="move_type"/>
                         </page>
@@ -978,7 +977,7 @@
                     <field name="invoice_state"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-go-forward" help="Approve Picking"/>
                 </tree>
             </field>
         </record>
@@ -1093,7 +1092,6 @@
                             <field name="active"/>
                             <field name="auto_picking"/>
                             <newline/>
-                            <field name="date"/>
                             <field name="date_done"/>
                             <field name="move_type"/>
                         </page>
@@ -1175,7 +1173,7 @@
                     <field name="invoice_state" groups="base.group_extended"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-ok" help="Receive products"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-ok" help="Receive products"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
                 </tree>
             </field>
@@ -1187,7 +1185,6 @@
             <field name="arch" type="xml">
                 <form string="Input Picking List">
                     <group colspan="4" col="6">
-
                         <field name="name" readonly="1"/>
                         <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" required="1" />
                         <field name="origin"/>
@@ -1222,7 +1219,7 @@
                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
                                         groups="base.group_extended"
                                         icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed,done"/>
+                                        states="draft,assigned,confirmed"/>
                                     <field name="state"/>
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
@@ -1251,9 +1248,9 @@
 
                                             <newline/>
                                             <label/>
-                                             <button groups="base.group_extended" name="267" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                             <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" states="draft,assigned,confirmed"/>
                                             <label/>
-                                            <button name="275" string="Split Stock Moves" type="action"
+                                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                               groups="base.group_extended"
                                               icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
@@ -1508,8 +1505,8 @@
                         <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Future stock moves that are ready"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
-                        <field name="location_id" string="Location" domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
-                        <field name="address_id" string="Partner" context="{'contact_display':'partner'}" domain="[('picking_id.address_id','ilike',self)]"/>
+                        <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
+                        <field name="address_id" string="Partner" context="{'contact_display':'partner'}" filter_domain="[('picking_id.address_id','ilike',self)]"/>
                         <field name="date_planned"/>
                     </group>
                     <newline/>
@@ -1676,7 +1673,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Extended options..." groups="base.group_extended">
-                       <field name="tracking_id"  context="{'tracking': self}" domain="[]" />
+                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
                     </group>
                 </search>
             </field>
@@ -1969,4 +1966,4 @@
             parent="menu_warehouse_config" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 33b3350d628..442cc8735b9 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -192,7 +192,7 @@
     seller_ids:
       - delay: 1
         name: stock.res_partner_shawtrust0
-        qty: 5.0
+        min_qty: 5.0
     supply_method: buy
     type: product
     uom_id: product.product_uom_unit
@@ -213,7 +213,7 @@
     seller_ids:
       - delay: 1
         name: res_partner_shawtrust0
-        qty: 5.0
+        min_qty: 5.0
     supply_method: buy
     type: product
     uom_id: product.product_uom_unit
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 149b0b04e84..7d0be0b333b 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -26,7 +26,10 @@ class change_standard_price(osv.osv_memory):
     _name = "stock.change.standard.price"
     _description = "Change Standard Price"
     _columns = {
-            'new_price': fields.float('Price', required=True),
+            'new_price': fields.float('Price', required=True, 
+                                      help="If cost price is increased, stock variation account will be debited " 
+                                            "and stock output account will be credited with the value = (difference of amount * quantity available).\n"
+                                            "If cost price is decreased, stock variation account will be creadited and stock input account will be debited."),
             'stock_account_input':fields.many2one('account.account', 'Stock Input Account'),
             'stock_account_output':fields.many2one('account.account', 'Stock Output Account'),
             'stock_journal':fields.many2one('account.journal', 'Stock journal', required=True),
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index 374a34b4b6a..b46829b1a0a 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -7,7 +7,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Change Standard Price">
-             		<field name="new_price"/>              		
+                    <separator string="Change Price" colspan="4"/>
+                    <newline/>
+             		<field name="new_price" string="Cost Price"/>              		
                     <separator string="" colspan="4" />
                     <label string="" colspan="2"/>
               		<group col="2" colspan="2">                        
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 67dd232c168..044dc131df0 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -68,8 +68,7 @@ class stock_partial_move(osv.osv_memory):
         move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
         _moves_arch_lst = """<form string="Deliver Products">
                         <separator colspan="4" string="Delivery Information"/>
-                    	<field name="date"  />
-                    	<separator colspan="4"/>
+                    	<field name="date"  colspan="2"/>
                      <group colspan="4" attrs="{'invisible':[('type','=','in')]}">
                         <field name="partner_id"  attrs="{'required':[('type','!=','in')]}" />
                         <field name="address_id"  attrs="{'required':[('type','!=','in')]}"/>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 4083785a8d1..5cad3807ab3 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -48,6 +48,8 @@ class stock_partial_picking(osv.osv_memory):
                     self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity")
                 if 'move%s_product_uom'%(m.id) not in self._columns:
                     self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM")
+                if 'move%s_prodlot_id'%(m.id) not in self._columns:
+                    self._columns['move%s_prodlot_id'%(m.id)] = fields.many2one('stock.production.lot', string="Lot")
 
                 if (m.product_id.cost_method == 'average'):
                     if 'move%s_product_price'%(m.id) not in self._columns:
@@ -62,8 +64,9 @@ class stock_partial_picking(osv.osv_memory):
         picking_ids = context.get('active_ids', False)
         _moves_arch_lst = """<form string="Deliver Products">
                         <separator colspan="4" string="Delivery Information"/>
-                    	<field name="date" />
-                    	<separator colspan="4"/>
+                        <group colspan="4" col="4">
+                    	<field name="date"/>
+                        </group>
                         <separator colspan="4" string="Move Detail"/>
                         """
         _moves_fields = result['fields']
@@ -91,6 +94,12 @@ class stock_partial_picking(osv.osv_memory):
                                     'relation': 'product.uom',
                                     'required' : True,
                                     'readonly' : True,
+                                    },
+                        'move%s_prodlot_id'%(m.id): {
+                                    'string': _('Production Lot'),
+                                    'type': 'many2one',
+                                    'relation': 'stock.production.lot',
+                                    'readonly': True,
                                     }
                     })
 
@@ -99,7 +108,8 @@ class stock_partial_picking(osv.osv_memory):
                         <field name="move%s_product_id" nolabel="1"/>
                         <field name="move%s_product_qty" string="Qty" />
                         <field name="move%s_product_uom" nolabel="1" />
-                    """%(m.id, m.id, m.id)
+                        <field name="move%s_prodlot_id" />
+                    """%(m.id, m.id, m.id, m.id)
                     if (m.product_id.cost_method == 'average'):
                         _moves_fields.update({
                             'move%s_product_price'%(m.id) : {
@@ -161,6 +171,8 @@ class stock_partial_picking(osv.osv_memory):
                     res['move%s_product_qty'%(m.id)] = m.product_qty
                 if 'move%s_product_uom'%(m.id) in fields:
                     res['move%s_product_uom'%(m.id)] = m.product_uom.id
+                if 'move%s_prodlot_id'%(m.id) in fields:
+                    res['move%s_prodlot_id'%(m.id)] = m.prodlot_id.id
 
                 if (m.product_id.cost_method == 'average'):
                     currency = False
@@ -203,7 +215,8 @@ class stock_partial_picking(osv.osv_memory):
                 partial_datas['move%s'%(m.id)] = {
                     'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
                     'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
-                    'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
+                    'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id,
+                    'prodlot_id' : getattr(partial, 'move%s_prodlot_id'%(m.id)).id
                 }
 
                 if (m.product_id.cost_method == 'average'):
diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py
index f24603672c9..b59ba72c41a 100644
--- a/addons/stock_invoice_directly/__openerp__.py
+++ b/addons/stock_invoice_directly/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -28,7 +28,7 @@
         When you send or deliver goods, this module automatically launch
         the invoicing wizard if the delivery is to be invoiced.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['delivery', 'stock'],
     'init_xml': [],
diff --git a/addons/stock_invoice_directly/i18n/zh_CN.po b/addons/stock_invoice_directly/i18n/zh_CN.po
index 162d29f1534..5c39d658cbb 100644
--- a/addons/stock_invoice_directly/i18n/zh_CN.po
+++ b/addons/stock_invoice_directly/i18n/zh_CN.po
@@ -7,16 +7,16 @@ 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"
-"PO-Revision-Date: 2010-03-20 10:29+0000\n"
+"PO-Revision-Date: 2010-07-17 05:33+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-06-22 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
-msgstr "发票直接分包"
+msgstr "直接发票装箱单"
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index e80b00fc7ad..18d8457a4a3 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -36,7 +36,7 @@ This module may be useful for different purposes:
    - Supplier Return
 * Manage products to be rent.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['procurement','stock'],
     'init_xml': [],
     'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
diff --git a/addons/stock_location/i18n/zh_CN.po b/addons/stock_location/i18n/zh_CN.po
index 03058100eb1..91d2c55e610 100644
--- a/addons/stock_location/i18n/zh_CN.po
+++ b/addons/stock_location/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 10:30+0000\n"
+"PO-Revision-Date: 2010-07-17 05:40+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-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
@@ -24,7 +24,7 @@ msgstr "转换要的天数"
 #. module: stock_location
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件!"
 
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
@@ -35,18 +35,18 @@ msgstr "库存库位路径"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
 msgid "Automatic No Step Added"
-msgstr "自动没步骤增加"
+msgstr "自动，不加入步骤"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
 msgid ""
 "These rules set the right path of the product in the whole location tree."
-msgstr "这些规则确定了库位树正确的产品路径"
+msgstr "这些规则确定了产品在整个库位树的正确路径"
 
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
@@ -89,7 +89,8 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"这些规则确定了库位树正确的产品路径.‘自动调拨’将创建库存调拨后当前将自动验证.‘手动操作’这库存调拨要工人验证.‘自动没增加步骤’库位是取代原来的"
+"这些规则确定了产品在库位树中的正确移动路径.\n"
+"‘自动调拨’ 将创建库存调拨后自动确认. ‘手动操作’ 库存调拨需要人工确认. ‘自动不加入步骤’ 库位是取代调拨源库位."
 
 #. module: stock_location
 #: field:stock.location.path,name:0
diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py
index 202b05cac86..88a09cb6380 100644
--- a/addons/stock_no_autopicking/__openerp__.py
+++ b/addons/stock_no_autopicking/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -33,7 +33,7 @@
     which is sub-contracted to "No Auto-Picking" and put the location of the
     supplier in the routing of the assembly operation.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['mrp'],
     'update_xml': ['stock_no_autopicking_view.xml'],
     'demo_xml': [],
diff --git a/addons/stock_no_autopicking/i18n/zh_CN.po b/addons/stock_no_autopicking/i18n/zh_CN.po
index 2ea8b0b6394..1904cd5b605 100644
--- a/addons/stock_no_autopicking/i18n/zh_CN.po
+++ b/addons/stock_no_autopicking/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 10:30+0000\n"
+"PO-Revision-Date: 2010-07-17 05: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-06-22 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
@@ -24,14 +24,14 @@ msgstr "无效的视图结构xml文件"
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr "自动分包"
+msgstr "自动装箱单"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
-msgstr "为生产原料单自动分包"
+msgstr "生产单原料的自动装箱单"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
 msgid "Stock No Auto-Picking"
-msgstr "库存没自动分包"
+msgstr "库存没自动装箱单"
diff --git a/addons/stock_planning/__init__.py b/addons/stock_planning/__init__.py
index f0fea471a21..9873817f0f3 100644
--- a/addons/stock_planning/__init__.py
+++ b/addons/stock_planning/__init__.py
@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -14,11 +15,12 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import stock_planning
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py
index 100e793805b..10e461acdf0 100644
--- a/addons/stock_planning/__openerp__.py
+++ b/addons/stock_planning/__openerp__.py
@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -14,18 +15,18 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 {
     "name":"Master Procurement Schedule",
     "version":"1.1",
-    "author":"Tiny and Grzegorz Grzelak (Cirrus)",
+    "author":"OpenERP SA and Grzegorz Grzelak (Cirrus)",
     "category":"Custom",
     "depends":["hr","stock","sale"],
     "description": """
-This module is based on original Tiny module stock_planning version 1.0 of the same name Master Procurement Schedule.
+This module is based on original OpenERP SA module stock_planning version 1.0 of the same name Master Procurement Schedule.
 
 Purpose of MPS is to allow create a manual procurement (requisition) apart of MRP scheduler (which works automatically on minimum stock rules).
 
@@ -138,7 +139,14 @@ Remarks:
 - 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.
 """,
     "demo_xml":[],
-    "update_xml":["security/ir.model.access.csv","stock_planning_view.xml"],
+    "update_xml": [
+        "security/ir.model.access.csv",
+        "stock_planning_view.xml",
+        "wizard/stock_planning_create_periods_view.xml",
+        "wizard/stock_planning_forecast_view.xml",
+        "wizard/stock_planning_createlines_view.xml",
+    ],
+    "test": ["test/stock_planning.yml"],
     "active": False,
     "installable": True,
 }
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index bdfcc9991a2..2e4f333b840 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -1,21 +1,20 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
@@ -27,7 +26,7 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 from osv import osv, fields
 import netsvc
 from tools.translate import _
-from tools import config
+#from tools import config
 
 
 def rounding(fl, round_value):
@@ -35,85 +34,6 @@ def rounding(fl, round_value):
         return fl
     return round(fl / round_value) * round_value
 
-# Object creating periods quickly
-# changed that stop_date is created with hour 23:59:00 when it was 00:00:00 stop date was excluded from period
-class stock_period_createlines(osv.osv_memory):
-    _name = "stock.period.createlines"
-
-    def _get_new_period_start(self, cr, uid, context=None):
-        cr.execute("select max(date_stop) from stock_period")
-        result = cr.fetchone()
-        last_date = result and result[0] or False
-        if last_date:
-            period_start = mx.DateTime.strptime(last_date,"%Y-%m-%d %H:%M:%S")+ RelativeDateTime(days=1)
-            period_start = period_start - RelativeDateTime(hours=period_start.hour, minutes=period_start.minute, seconds=period_start.second)
-        else:
-            period_start = mx.DateTime.today()
-        return period_start.strftime('%Y-%m-%d')
-
-
-    _columns = {
-        'name': fields.char('Period Name', size=64),
-        'date_start': fields.date('Start Date', required=True),
-        'date_stop': fields.date('End Date', required=True),
-        'period_ids': fields.one2many('stock.period', 'planning_id', 'Periods'),
-    }
-    _defaults={
-        'date_start': _get_new_period_start,
-    }
-
-    def create_period_weekly(self, cr, uid, ids, context=None):
-        res = self.create_period(cr, uid, ids, context, 6, 'Weekly')
-        return {
-                'view_type': 'form',
-                "view_mode": 'tree',
-                'res_model': 'stock.period',
-                'type': 'ir.actions.act_window',
-            }
-
-    def create_period_monthly(self,cr, uid, ids, interval=1, context=None):
-        for p in self.browse(cr, uid, ids, context=context):
-            dt = p.date_start
-            ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d')
-            while ds.strftime('%Y-%m-%d') < p.date_stop:
-                de = ds + RelativeDateTime(months=interval, minutes=-1)
-                self.pool.get('stock.period').create(cr, uid, {
-                    'name': ds.strftime('%Y/%m'),
-                    'date_start': ds.strftime('%Y-%m-%d'),
-                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
-                })
-                ds = ds + RelativeDateTime(months=interval)
-        return {
-                'view_type': 'form',
-                "view_mode": 'tree',
-                'res_model': 'stock.period',
-                'type': 'ir.actions.act_window',
-                }
-
-    def create_period(self, cr, uid, ids, interval=0, name='Daily', context=None):
-        for p in self.browse(cr, uid, ids, context=context):
-            dt = p.date_start
-            ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d')
-            while ds.strftime('%Y-%m-%d') < p.date_stop:
-                de = ds + RelativeDateTime(days=interval, minutes =-1)
-                if name =='Daily':
-                    new_name=de.strftime('%Y-%m-%d')
-                if name =="Weekly":
-                    new_name = de.strftime('%Y, week %W')
-                self.pool.get('stock.period').create(cr, uid, {
-                    'name': new_name,
-                    'date_start': ds.strftime('%Y-%m-%d'),
-                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
-                })
-                ds = ds + RelativeDateTime(days=interval) + 1
-        return {
-                'view_type': 'form',
-                "view_mode": 'tree',
-                'res_model': 'stock.period',
-                'type': 'ir.actions.act_window',
-            }
-stock_period_createlines()
-
 # Periods have no company_id field as they can be shared across similar companies.
 # If somone thinks different it can be improved.
 class stock_period(osv.osv):
@@ -131,104 +51,6 @@ class stock_period(osv.osv):
 
 stock_period()
 
-# Creates forecasts records for products from selected Product Category for selected 'Warehouse - Period'
-# Object added by contributor in ver 1.1
-class stock_sale_forecast_createlines(osv.osv_memory):
-    _name = "stock.sale.forecast.createlines"
-    _description = "stock.sale.forecast.createlines"
-
-# FIXME Add some period sugestion like below
-
-#    def _get_latest_period(self,cr,uid,context={}):
-#        cr.execute("select max(date_stop) from stock_period")
-#        result=cr.fetchone()
-#        return result and result[0] or False
-
-
-    _columns = {
-        'company_id': fields.many2one('res.company', 'Company', required=True, select=1),
-        'warehouse_id1': fields.many2one('stock.warehouse' , 'Warehouse', required=True, \
-                                help='Warehouse which forecasts will concern. '\
-                                   'If during stock planning you will need sales forecast for all warehouses choose any warehouse now.'),
-        'period_id1': fields.many2one('stock.period' , 'Period', required=True, help = 'Period which forecasts will concern.' ),
-        'product_categ_id1': fields.many2one('product.category' , 'Product Category', required=True, \
-                                help ='Product Category of products which created forecasts will concern.'),
-        'copy_forecast': fields.boolean('Copy Last Forecast', help="Copy quantities from last Stock and Sale Forecast."),
-                }
-
-    _defaults = {
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.sale.forecast.createlines', context=c),
-    }
-
-    def create_forecast(self, cr, uid, ids, context=None):
-        product_obj = self.pool.get('product.product')
-        forecast_obj = self.pool.get('stock.sale.forecast')
-        mod_obj = self.pool.get('ir.model.data')
-        prod_categ_obj = self.pool.get('product.category')
-        template_obj = self.pool.get('product.template')
-        for f in self.browse(cr, uid, ids, context=context):
-            categ_ids =  f.product_categ_id1.id and [f.product_categ_id1.id] or []
-            prod_categ_ids = prod_categ_obj.search(cr, uid, [('parent_id','child_of', categ_ids)])
-            templates_ids = template_obj.search(cr, uid, [('categ_id','in',prod_categ_ids)])
-            products_ids = product_obj.search(cr, uid, [('product_tmpl_id','in',templates_ids)])
-            if len(products_ids) == 0:
-                raise osv.except_osv(_('Error !'), _('No products in selected category !'))
-            copy = f.copy_forecast
-            for p in product_obj.browse(cr, uid, products_ids,{}):
-                if len(forecast_obj.search(cr, uid, [('product_id','=',p.id) , \
-                                                       ('period_id','=',f.period_id1.id), \
-                                                       ('user_id','=',uid), \
-                                                       ('warehouse_id','=',f.warehouse_id1.id)]))== 0:
-                    forecast_qty = 0.0
-# Not sure if it is expected quantity for this feature (copying forecast from previous period)
-# because it can take incidental forecast of this warehouse, this product and this user (creating, writing or validating forecast).
-# It takes only one forecast line (no sum). If user creates only one forecast per period it will be OK. If not I have no idea how to count it.
-
-                    prod_uom = False
-                    if copy:
-                        cr.execute("SELECT period.date_stop, forecast.product_qty, forecast.product_uom \
-                                    FROM stock_sale_forecast AS forecast \
-                                    LEFT JOIN stock_period AS period \
-                                    ON forecast.period_id = period.id \
-                                    WHERE (forecast.user_id = %s OR forecast.create_uid = %s OR forecast.write_uid = %s) \
-                                        AND forecast.warehouse_id = %s AND forecast.product_id = %s \
-                                        AND period.date_stop < %s \
-                                    ORDER BY period.date_stop DESC",
-                                    (uid, uid, uid, f.warehouse_id1.id, p.id, f.period_id1.date_stop) )
-                        ret = cr.fetchone()
-                        if ret:
-                            forecast_qty = ret[1]
-                            prod_uom = ret[2]
-                    prod_uom = prod_uom or p.uom_id.id
-                    prod_uos_categ = False
-                    if p.uos_id:
-                        prod_uos_categ = p.uos_id.category_id.id
-                    forecast_obj.create(cr, uid, {
-                        'company_id': f.warehouse_id1.company_id.id,
-                        'period_id': f.period_id1.id,
-                        'warehouse_id': f.warehouse_id1.id,
-                        'product_id': p.id,
-                        'product_qty': forecast_qty,
-                        'product_amt': 0.0,
-                        'product_uom': prod_uom,
-                        'active_uom': prod_uom,
-                        'product_uom_categ': p.uom_id.category_id.id,
-                        'product_uos_categ': prod_uos_categ,
-                     })
-        result = mod_obj._get_id(cr, uid, 'stock_planning', 'view_stock_sale_forecast_filter')
-        id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'tree',
-                'res_model': 'stock.sale.forecast',
-                'type': 'ir.actions.act_window',
-                'search_view_id': id['res_id'],
-            }
-
-stock_sale_forecast_createlines()
-
-
 # Stock and Sales Forecast object. Previously stock_planning_sale_prevision.
 # A lot of changes in 1.1
 class stock_sale_forecast(osv.osv):
@@ -422,9 +244,11 @@ class stock_sale_forecast(osv.osv):
                     dept_id =  obj.analyzed_dept_id.id and [obj.analyzed_dept_id.id] or []
                     dept_ids = dept_obj.search(cr,uid,[('parent_id','child_of',dept_id)])
 #                    dept_ids_set = ','.join(map(str,dept_ids))
-                    cr.execute("SELECT user_id FROM hr_department_user_rel WHERE (department_id IN %s)" ,(tuple(dept_ids),))
+#                    cr.execute("SELECT user_id FROM hr_department_user_rel WHERE (department_id IN %s)" ,(tuple(dept_ids),))
+                    cr.execute("SELECT id FROM hr_employee WHERE (department_id IN %s)" ,(tuple(dept_ids),))
                     dept_users = [x for x, in cr.fetchall()]
-                    dept_users_set =  ','.join(map(str,dept_users))
+#                    dept_users_set =  ','.join(map(str,dept_users))
+                    dept_users_set =  map(str,dept_users)
                 else:
                     dept_users = False
                 factor, round_value = self._from_default_uom_factor(cr, uid, obj, obj.product_uom.id, context=context)
@@ -474,124 +298,6 @@ class stock_sale_forecast(osv.osv):
 
 stock_sale_forecast()
 
-# Creates stock planning records for products from selected Product Category for selected 'Warehouse - Period'
-# Object added by contributor in ver 1.1
-class stock_planning_createlines(osv.osv_memory):
-    _name = "stock.planning.createlines"
-
-    def onchange_company(self, cr, uid, ids, company_id=False):
-        result = {}
-        if company_id:
-            result['warehouse_id2'] = False
-        return {'value': result}
-
-    _columns = {
-        'company_id': fields.many2one('res.company', 'Company', required=True),
-        'period_id2': fields.many2one('stock.period' , 'Period', required=True, help = 'Period which planning will concern.'),
-        'warehouse_id2': fields.many2one('stock.warehouse' , 'Warehouse', required=True, help = 'Warehouse which planning will concern.'),
-        'product_categ_id2': fields.many2one('product.category' , 'Product Category', \
-                        help = 'Planning will be created for products from Product Category selected by this field. '\
-                               'This field is ignored when you check \"All Forecasted Product\" box.' ),
-        'forecasted_products': fields.boolean('All Products with Forecast', \
-                     help = "Check this box to create planning for all products having any forecast for selected Warehouse and Period. "\
-                            "Product Category field will be ignored."),
-    }
-
-    _defaults = {
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.planning', context=c),
-    }
-
-    def create_planning(self,cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        product_obj = self.pool.get('product.product')
-        planning_obj = self.pool.get('stock.planning')
-        mod_obj = self.pool.get('ir.model.data')
-        for f in self.browse(cr, uid, ids, context=context):
-            if f.forecasted_products:
-                cr.execute("SELECT product_id \
-                                FROM stock_sale_forecast \
-                                WHERE (period_id = %s) AND (warehouse_id = %s)", (f.period_id2.id, f.warehouse_id2.id))
-                products_id1 = [x for x, in cr.fetchall()]
-            else:
-                prod_categ_obj = self.pool.get('product.category')
-                template_obj = self.pool.get('product.template')
-                categ_ids = f.product_categ_id2.id and [f.product_categ_id2.id] or []
-                prod_categ_ids = prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)])
-                templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)])
-                products_id1 = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)])
-            if len(products_id1)==0:
-                raise osv.except_osv(_('Error !'), _('No forecasts for selected period or no products in selected category !'))
-
-            for p in product_obj.browse(cr, uid, products_id1,context=context):
-                if len(planning_obj.search(cr, uid, [('product_id','=',p.id),
-                                                      ('period_id','=',f.period_id2.id),
-                                                      ('warehouse_id','=',f.warehouse_id2.id)]))== 0:
-                    cr.execute("SELECT period.date_stop, planning.product_uom, planning.planned_outgoing, planning.to_procure, \
-                                    planning.stock_only, planning.procure_to_stock, planning.confirmed_forecasts_only, \
-                                    planning.supply_warehouse_id, planning.stock_supply_location \
-                                FROM stock_planning AS planning \
-                                LEFT JOIN stock_period AS period \
-                                ON planning.period_id = period.id \
-                                WHERE (planning.create_uid = %s OR planning.write_uid = %s) \
-                                     AND planning.warehouse_id = %s AND planning.product_id = %s \
-                                     AND period.date_stop < %s \
-                                ORDER BY period.date_stop DESC",
-                                    (uid, uid, f.warehouse_id2.id, p.id, f.period_id2.date_stop) )
-                    ret=cr.fetchone()
-#                        forecast_qty = ret and ret[0] or 0.0
-                    if ret:
-#                            raise osv.except_osv(_('Error !'), _('ret is %s %s %s %s %s %s')%(ret[0],ret[2],ret[3],ret[4],ret[5],ret[6],))
-                        prod_uom = ret[1]
-                        planned_out = ret[2]
-                        to_procure = ret[3]
-                        stock_only = ret[4]
-                        procure_to_stock = ret[5]
-                        confirmed_forecasts_only = ret[6]
-                        supply_warehouse_id = ret[7]
-                        stock_supply_location = ret[8]
-                    else:
-                        prod_uom = p.uom_id.id
-                        planned_out = False
-                        to_procure = False
-                        stock_only = False
-                        procure_to_stock = False
-                        confirmed_forecasts_only = False
-                        supply_warehouse_id = False
-                        stock_supply_location = False
-                    prod_uos_categ = False
-                    if p.uos_id:
-                        prod_uos_categ = p.uos_id.category_id.id
-                    planning_obj.create(cr, uid, {
-                        'company_id' : f.warehouse_id2.company_id.id,
-                        'period_id': f.period_id2.id,
-                        'warehouse_id' : f.warehouse_id2.id,
-                        'product_id': p.id,
-                        'product_uom' : prod_uom,
-                        'product_uom_categ' : p.uom_id.category_id.id,
-                        'product_uos_categ' : prod_uos_categ,
-                        'active_uom' : prod_uom,
-                        'planned_outgoing': planned_out,
-                        'to_procure': to_procure,
-                        'stock_only': stock_only,
-                        'procure_to_stock': procure_to_stock,
-                        'confirmed_forecasts_only': confirmed_forecasts_only,
-                        'supply_warehouse_id': supply_warehouse_id,
-                        'stock_supply_location': stock_supply_location,
-
-                    })
-        result = mod_obj._get_id(cr, uid, 'stock_planning', 'view_stock_planning_filter')
-        id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
-        return {
-                'view_type': 'form',
-                "view_mode": 'tree',
-                'res_model': 'stock.planning',
-                'type': 'ir.actions.act_window',
-                'search_view_id': id['res_id'],
-            }
-stock_planning_createlines()
-
-
 # The main Stock Planning object
 # A lot of changes by contributor in ver 1.1
 class stock_planning(osv.osv):
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 7da194d91e1..10297a8ef81 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -1,47 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
+    <data>
         <menuitem id="menu_stock_period_main"
                   name="Stock and Sales Periods"
                   parent="base.menu_base_config" sequence="20"/>
 
-    <!-- Creating periods section -->
-
-    <record id="view_stock_period_createlines_form" model="ir.ui.view">
-            <field name="name">stock.period.createlines.form</field>
-            <field name="model">stock.period.createlines</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Stock and Sales Periods">
-                    <separator colspan="4" string="Create periods for Stock and Sales Planning"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
-                    <separator colspan="4" string=""/>
-                    <group col="3" colspan="4">
-                        <button name="create_period"  icon="gtk-execute" string="Create Daily Periods" type="object"/>
-                        <button name="create_period_weekly" icon="gtk-execute"  string="Create Weekly Periods" type="object"/>
-                        <button name="create_period_monthly"  icon="gtk-execute" string="Create Monthly Periods" type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_stock_period_createlines_form" model="ir.actions.act_window">
-            <field name="name">Stock and Sales Planning Periods</field>
-            <field name="res_model">stock.period.createlines</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_stock_period_createlines_form"/>
-            <field name="target">new</field>
-        </record>
-
-        <menuitem id="menu_stock_period_creatlines"
-                  name="Create Stock and Sales Periods"
-                  parent="menu_stock_period_main"
-                  action="action_stock_period_createlines_form"
-                  sequence = "5"/>
-
-<!-- Periods tree and form section -->
+        <!-- Periods tree and form section -->
 
         <record id="view_stock_period_form" model="ir.ui.view">
             <field name="name">stock.period.form</field>
@@ -78,53 +42,12 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-
         <menuitem
             id="menu_stock_period"
             parent="menu_stock_period_main"
             action="action_stock_period_form"
             sequence = "10"/>
 
-<!--   Create Forecast section   -->
-
-        <record id="view_stock_sale_forecast_createlines_form" model="ir.ui.view">
-            <field name="name">stock.sale.forecast.createlines</field>
-            <field name="model">stock.sale.forecast.createlines</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Stock and Sales Forecasts">
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="period_id1"/>
-                    <newline/>
-                    <field name="warehouse_id1" domain = "[('company_id','=',company_id)] "/>
-                    <newline/>
-                    <field name="product_categ_id1" widget="selection"/>
-                    <newline/>
-                    <field name="copy_forecast"/>
-                    <separator colspan ="4" string="Forecast lines creation"/>
-                    <label  colspan ="4" string="Creates forecast lines for selected warehouse and period. Doesn't duplicate existing lines created by you."/>
-                    <group colspan="4">
-                        <button icon="gtk-cancel"  special="cancel" string="Cancel"/>
-                        <button icon="gtk-execute" name="create_forecast" string="Create Forecasts" type="object" />
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_stock_sale_forecast_createlines_form" model="ir.actions.act_window">
-            <field name="name">Create Sales Forecasts</field>
-            <field name="res_model">stock.sale.forecast.createlines</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_stock_sale_forecast_createlines_form"/>
-            <field name="target">new</field>
-        </record>
-
-        <menuitem id="menu_stock_sale_forecast" name="Sales Forecasts" 
-                parent="base.menu_base_partner" sequence="6"/>
-        <menuitem id="menu_stock_sale_forecast_createlines" name="Create Sales Forecasts" parent="menu_stock_sale_forecast" action="action_stock_sale_forecast_createlines_form" sequence = "5"/>
-
         <record id="view_stock_sale_forecast_form" model="ir.ui.view">
             <field name="name">stock.sale.forecast.form</field>
             <field name="model">stock.sale.forecast</field>
@@ -132,7 +55,7 @@
             <field name="arch" type="xml">
                 <form string="Stock and Sales Forecast">
                     <group colspan = "4" col = "4">
-                <group colspan = "2" col="2" >
+                        <group colspan = "2" col="2" >
                             <field name="company_id" select="1"
                                         groups="base.group_multi_company"
                                         widget="selection"
@@ -140,22 +63,22 @@
                             <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
                             <field name="period_id" />
                             <field name="product_id" on_change="product_id_change(product_id)" />
-                <field name="product_uom_categ"  invisible = "True"/>
-                <field name="product_uos_categ"  invisible = "True"/>
+                            <field name="product_uom_categ"  invisible = "True"/>
+                            <field name="product_uos_categ"  invisible = "True"/>
                             <field name="product_uom"
                                          domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
                                          on_change = "onchange_uom(product_uom, product_qty, active_uom)"/>
                             <field name="active_uom" invisible = "True" />
-                 </group>
-                 <group colspan = "2" col="2" >
+                        </group>
+                        <group colspan = "2" col="2" >
                             <field name="user_id"/>
                             <field name="product_amt" on_change="product_amt_change( product_amt, product_uom)" />
                             <field name="product_qty"  />
                             <field name="state"/>
                             <label string = ""/>
-                            <button name="action_validate" icon="gtk-apply" string="Validate" states="draft" type="object" colspan = "1"/>
+                            <button name="action_validate" icon="gtk-apply" string="Approve" states="draft" type="object" colspan = "1"/>
 
-                </group>
+                        </group>
                     </group>
                     <separator colspan ="4" string="Sales history"/>
                     <group colspan = "4" col = "5">
@@ -199,7 +122,6 @@
                         <button name="calculate_sales_history" icon="gtk-execute"
                                 string="Calculate Sales History" type="object" colspan = "1" states="draft" />
                     </group>
-
                 </form>
             </field>
         </record>
@@ -209,15 +131,14 @@
             <field name="model">stock.sale.forecast</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Sales Forecasts" editable="bottom">
-                    <field name="warehouse_id"/>
-                    <field name ="company_id"/>
-                    <field name="user_id"/>
+                <tree string="Sales Forecasts" colors="gray:state=='validated';black:state=='draft'">
                     <field name="period_id"/>
                     <field name="product_id" on_change="product_id_change(product_id)" />
                     <field name="product_qty"/>
                     <field name="product_uom" />
-                    
+                    <field name="warehouse_id"/>
+                    <field name="company_id"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -234,9 +155,13 @@
                 </graph>
             </field>
         </record>
+        
+        <!-- Forecast section -->
+        
+        <menuitem id="menu_stock_sale_forecast" name="Sales Forecasts" 
+                parent="base.menu_base_partner" sequence="6"/>
 
-
-       <record id="view_stock_sale_forecast_filter" model="ir.ui.view">
+        <record id="view_stock_sale_forecast_filter" model="ir.ui.view">
             <field name="name">stock.sale.forecast.list.select</field>
             <field name="model">stock.sale.forecast</field>
             <field name="type">search</field>
@@ -275,51 +200,10 @@
                   parent="menu_stock_sale_forecast"
                   action="action_view_stock_sale_forecast_form"/>
 
-<!-- Create Planning section -->
-
+        <!-- Planning section -->
+        
         <menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root" sequence="2"/>
 
-       <record id="view_stock_planning_createlines_form" model="ir.ui.view">
-            <field name="name">stock.planning.createlines.form</field>
-            <field name="model">stock.planning.createlines</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Stock Planning">
-            <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="period_id2" widget="selection"/>
-                    <newline/>
-                    <field name="warehouse_id2" domain = "[('company_id','=',company_id)] "/>
-                    <newline/>
-                    <field name="forecasted_products"/>
-                    <newline/>
-                    <field name="product_categ_id2" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
-                    <separator colspan ="4" string="Stock planning lines creation"/>
-                    <label  colspan ="4" string="Creates planning lines for selected period and warehouse. Doesn't duplicate existing lines created by you."/>
-                    <group colspan="4">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="create_planning" string="Create Stock Planning" type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_stock_planning_createlines_form" model="ir.actions.act_window">
-            <field name="name">Create Stock Planning Lines</field>
-            <field name="res_model">stock.planning.createlines</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_stock_planning_createlines_form"/>
-            <field name="target">new</field>
-        </record>
-
-        <menuitem
-            id="menu_stock_planning_createlines"
-            parent="menu_stock_planning_main"
-            action="action_stock_planning_createlines_form" sequence = "5"/>
-
-<!-- Planning section -->
-
         <record id="view_stock_planning_form" model="ir.ui.view">
             <field name="name">stock.planning.form</field>
             <field name="model">stock.planning</field>
@@ -330,14 +214,13 @@
                     <group colspan="4" col="7">
                         <group colspan ="3" col="2">
                             <separator colspan ="2" string = "General Info"/>
-
                             <field name="company_id" select = "1" widget= "selection"
                                          on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
                             <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
                             <field name="period_id" />
                             <field name="product_id" on_change="product_id_change(product_id)"  />
-                <field name="product_uom_categ"  invisible = "True"/>
-                <field name="product_uos_categ"  invisible = "True"/>
+                            <field name="product_uom_categ"  invisible = "True"/>
+                            <field name="product_uos_categ"  invisible = "True"/>
                             <field name="product_uom"
                                          domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
                                          on_change = "onchange_uom(product_uom)"/>
@@ -346,8 +229,6 @@
                             <field name="warehouse_forecast"/>
                             <field name="company_forecast"/>
                             <field name="confirmed_forecasts_only"/>
-
-
                         </group>
                         <group colspan ="2" col="2">
                             <separator colspan ="2" string = "Current Period Situation"/>
@@ -415,7 +296,6 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Master Procurement Schedule" colors ="blue:line_time=='Past';black:line_time=='Future'">
-                    <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
                     <field name="period_id"/>
                     <field name="product_id" on_change="product_id_change(product_id)" />
                     <field name="product_uom"/>
@@ -423,6 +303,7 @@
                     <field name="planned_outgoing"/>
                     <field name="to_procure"/>
                     <field name="stock_simulation" string="Stock"/>   <!-- previously stock_start -->
+                    <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
                 </tree>
             </field>
         </record>
diff --git a/addons/stock_planning/test/stock_planning.yml b/addons/stock_planning/test/stock_planning.yml
new file mode 100644
index 00000000000..178c361a10c
--- /dev/null
+++ b/addons/stock_planning/test/stock_planning.yml
@@ -0,0 +1,150 @@
+-
+  In order to test the flow of stock planning module. I will create forecast periods,
+  stock forecast and then with master procurement schedule.
+-
+  I create weekly stock periods for the month of July.
+-
+  I create stock period for the first week of July.
+- 
+  !record {model: stock.period, id: stock_period_01}:
+    date_start: '2010-07-01 00:00:00'
+    date_stop: '2010/07/06 23:59:00'
+    name: 2010, week 27
+-
+  I create stock period for the second week of July.
+- 
+  !record {model: stock.period, id: stock_period_02}:
+    date_start: '2010/07/07 00:00:00'
+    date_stop: '2010/07/12 23:59:00'
+    name: 2010, week 28
+-
+  I create stock period for the third week of July.
+- 
+  !record {model: stock.period, id: stock_period_03}:
+    date_start: '2010/07/15 00:00:00'
+    date_stop: '2010/07/20 23:59:00'
+    name: 2010, week 29
+-
+  I create stock period for the fourth week of July.
+- 
+  !record {model: stock.period, id: stock_period_04}:
+    date_start: '2010/07/22 00:00:00'
+    date_stop: '2010/07/27 23:59:00'
+    name: 2010, week 30
+-
+  I create stock period for the fifth week of July.
+- 
+  !record {model: stock.period, id: stock_period_05}:
+    date_start: '2010/07/29 00:00:00'
+    date_stop: '2010/07/31 23:59:00'
+    name: 2010, week 31
+-
+  Now I create the forecast for this period for all PCs.
+-
+  !record {model: stock.sale.forecast.createlines, id: stock_sale_forecast_createlines_0}:
+    company_id: base.main_company
+    period_id: stock_period_03
+    product_categ_id: product.product_category_pc
+    warehouse_id: stock.warehouse0
+- 
+  Performing an osv_memory action create_forecast on module stock.sale.forecast.createlines
+-
+  !python {model: stock.sale.forecast.createlines}: |
+    self.create_forecast(cr, uid, [ref("stock_sale_forecast_createlines_0")], {"lang":
+      'en_US', "active_model": "ir.ui.menu", "active_ids": [ref("stock_planning.menu_stock_sale_forecast_createlines")],
+      "tz": False, "active_id": ref("stock_planning.menu_stock_sale_forecast_createlines"),
+      })
+-
+  I create a sale order for PC1-Basic PC and PC3-Medium PC.
+- 
+  !record {model: sale.order, id: sale_order_so0}:
+    date_order: '2010-07-20'
+    invoice_quantity: order
+    name: SO006
+    order_line:
+      - name: '[PC1] Basic PC'
+        price_unit: 450.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 13.0
+        state: draft
+        delay: 2.0
+        product_id: product.product_product_pc1
+        product_uos_qty: 13.0
+        th_weight: 0.0
+        type: make_to_stock
+      - name: '[PC3] Medium PC'
+        price_unit: 900.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 5.0
+        state: draft
+        delay: 3.0
+        product_id: product.product_product_pc3
+        product_uos_qty: 5.0
+        th_weight: 0.0
+        type: make_to_stock
+    order_policy: manual
+    partner_id: base.res_partner_desertic_hispafuentes
+    partner_invoice_id: base.res_partner_address_3000
+    partner_order_id: base.res_partner_address_3000
+    partner_shipping_id: base.res_partner_address_3000
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+-
+  Now I want to calculate sales history for both the products PC1-Basic PC and PC3-Medium PC and forecast the quantity.
+-
+  !python {model: stock.sale.forecast}: |
+    forecast_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc1'))])
+    write_dict = {'product_qty': 30.0,
+    'analyzed_dept_id': ref("hr.dep_sales"),
+    'analyzed_period1_id': ref("stock_period_03"),
+    'analyzed_user_id': ref("base.user_root"),
+    'analyzed_warehouse_id': ref("stock.warehouse0")}
+    self.write(cr, uid, forecast_ids, write_dict)
+    self.calculate_sales_history(cr, uid, forecast_ids, {"lang": "en_US", "tz":
+      False, "search_default_create_uid": 1, "active_model": "ir.ui.menu", "department_id":
+      False, "active_ids": [ref("stock_planning.menu_stock_sale_forecast_all")], "active_id":
+      ref("stock_planning.menu_stock_sale_forecast_all"), })
+- 
+  I create Master procurement schedule for the third week of July.
+- 
+  !record {model: stock.planning.createlines, id: stock_planning_createlines_0}:
+    company_id: base.main_company
+    period_id: stock_period_03
+    product_categ_id: product.product_category_pc
+    warehouse_id: stock.warehouse0
+- 
+  Performing an osv_memory action create_planning on module stock.planning.createlines
+- 
+  !python {model: stock.planning.createlines}: |
+    self.create_planning(cr, uid, [ref("stock_planning_createlines_0")], {"lang":
+      "en_US", "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("stock_planning.menu_stock_planning_createlines")],
+      "active_id": ref("stock_planning.menu_stock_planning_createlines"), "department_id":
+      False, })
+-
+  I calculate the planning in master procurement schedule.
+-
+  !python {model: stock.planning}: |
+    planning_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc1')),('period_id','=',ref('stock_period_03'))])
+    self.write(cr, uid, planning_ids, {'to_procure': 30.0,'planned_outgoing': 40.0})
+    self.calculate_planning(cr, uid, planning_ids, {"lang": "en_US", "tz": False,
+      "active_model": "ir.ui.menu", "active_ids": [ref("stock_planning.menu_stock_planning")],
+      "active_id": ref("stock_planning.menu_stock_planning"), "department_id": False,
+      })
+-
+  I create a procurement order for the incoming products left.
+-
+  !python {model: stock.planning}: |
+    planning_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc1')),('period_id','=',ref('stock_period_03'))])
+    plann = self.browse(cr, uid, planning_ids)
+    assert plann[0].incoming_left, 'Incoming Left must be greater than 0 !'
+    self.procure_incomming_left(cr, uid, planning_ids, {"lang": 'en_US', "tz":
+      False, "active_model": "ir.ui.menu", "active_ids": [ref("stock_planning.menu_stock_planning")],
+      "active_id": ref("stock_planning.menu_stock_planning"), "department_id": False,
+      })
+-
+  I check whether the procurement orders are created or not.
+-
+  !python {model: procurement.order}: |
+    proc_ids = self.search(cr, uid, [('origin','=','MPS(admin) 2010, week 29'),('product_id','=',ref("product.product_product_pc1"))])
+    assert proc_ids,'No Procurements!'
diff --git a/addons/stock_planning/wizard/__init__.py b/addons/stock_planning/wizard/__init__.py
new file mode 100644
index 00000000000..1e9d74d0394
--- /dev/null
+++ b/addons/stock_planning/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 stock_planning_create_periods
+import stock_planning_forecast
+import stock_planning_createlines
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods.py b/addons/stock_planning/wizard/stock_planning_create_periods.py
new file mode 100644
index 00000000000..fe953806dcc
--- /dev/null
+++ b/addons/stock_planning/wizard/stock_planning_create_periods.py
@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 time
+import mx.DateTime
+from mx.DateTime import RelativeDateTime, now, DateTime, localtime
+
+from osv import osv, fields
+
+# Object creating periods quickly
+# changed that stop_date is created with hour 23:59:00 when it was 00:00:00 stop date was excluded from period
+class stock_period_createlines(osv.osv_memory):
+    _name = "stock.period.createlines"
+
+    def _get_new_period_start(self, cr, uid, context=None):
+        cr.execute("select max(date_stop) from stock_period")
+        result = cr.fetchone()
+        last_date = result and result[0] or False
+        if last_date:
+            period_start = mx.DateTime.strptime(last_date,"%Y-%m-%d %H:%M:%S")+ RelativeDateTime(days=1)
+            period_start = period_start - RelativeDateTime(hours=period_start.hour, minutes=period_start.minute, seconds=period_start.second)
+        else:
+            period_start = mx.DateTime.today()
+        return period_start.strftime('%Y-%m-%d')
+
+
+    _columns = {
+        'name': fields.char('Period Name', size=64),
+        'date_start': fields.date('Start Date', required=True),
+        'date_stop': fields.date('End Date', required=True),
+        'period_ids': fields.one2many('stock.period', 'planning_id', 'Periods'),
+    }
+    _defaults={
+        'date_start': _get_new_period_start,
+    }
+    
+    def create_stock_periods(self, cr, uid, ids, context=None):
+        interval = context.get('interval',0)
+        name = context.get('name','Daily')
+        period_obj = self.pool.get('stock.period')
+        lines = []
+        for p in self.browse(cr, uid, ids, context=context):
+            dt = p.date_start
+            ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d')
+            while ds.strftime('%Y-%m-%d') < p.date_stop:
+                if name =='Daily':
+                    de = ds + RelativeDateTime(days=interval, minutes =-1)
+                    new_name = de.strftime('%Y-%m-%d')
+                    new_id = period_obj.create(cr, uid, {
+                    'name': new_name,
+                    'date_start': ds.strftime('%Y-%m-%d'),
+                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
+                    })
+                    ds = ds + RelativeDateTime(days=interval) + 1
+                if name =="Weekly":
+                    de = ds + RelativeDateTime(days=interval, minutes =-1)
+                    new_name = de.strftime('%Y, week %W')
+                    new_id = period_obj.create(cr, uid, {
+                    'name': new_name,
+                    'date_start': ds.strftime('%Y-%m-%d'),
+                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
+                    })
+                    ds = ds + RelativeDateTime(days=interval) + 1
+                if name == "Monthly":
+                    de = ds + RelativeDateTime(months=interval, minutes=-1)
+                    new_name = ds.strftime('%Y/%m')
+                    new_id =period_obj.create(cr, uid, {
+                    'name': new_name,
+                    'date_start': ds.strftime('%Y-%m-%d'),
+                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
+                    })
+                    ds = ds + RelativeDateTime(months=interval)
+                lines.append(new_id)
+        return {
+                'domain': "[('id','in', ["+','.join(map(str, lines))+"])]",
+                'view_type': 'form',
+                "view_mode": 'tree, form',
+                'res_model': 'stock.period',
+                'type': 'ir.actions.act_window',
+        }
+
+stock_period_createlines()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
new file mode 100644
index 00000000000..4d0f9ae6a82
--- /dev/null
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- Creating periods section -->
+
+        <record id="view_stock_period_createlines_form" model="ir.ui.view">
+            <field name="name">stock.period.createlines.form</field>
+            <field name="model">stock.period.createlines</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock and Sales Periods">
+                    <separator colspan="4" string="Create periods for Stock and Sales Planning"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                    <separator colspan="4" string=""/>
+                    <group col="3" colspan="4">
+                        <button name="create_stock_periods" icon="gtk-execute" string="Create Daily Periods" type="object"/>
+                        <button name="create_stock_periods" icon="gtk-execute"  string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}"/>
+                        <button name="create_stock_periods" icon="gtk-execute" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_stock_period_createlines_form" model="ir.actions.act_window">
+            <field name="name">Stock and Sales Planning Periods</field>
+            <field name="res_model">stock.period.createlines</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_stock_period_createlines_form"/>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem id="menu_stock_period_creatlines"
+                  name="Create Stock and Sales Periods"
+                  parent="menu_stock_period_main"
+                  action="action_stock_period_createlines_form"
+                  sequence = "5"/>
+    </data>
+</openerp>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines.py b/addons/stock_planning/wizard/stock_planning_createlines.py
new file mode 100644
index 00000000000..a0aa1e85249
--- /dev/null
+++ b/addons/stock_planning/wizard/stock_planning_createlines.py
@@ -0,0 +1,146 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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, fields
+from tools.translate import _
+
+# Creates stock planning records for products from selected Product Category for selected 'Warehouse - Period'
+# Object added by contributor in ver 1.1
+class stock_planning_createlines(osv.osv_memory):
+    _name = "stock.planning.createlines"
+
+    def onchange_company(self, cr, uid, ids, company_id=False):
+        result = {}
+        if company_id:
+            result['warehouse_id'] = False
+        return {'value': result}
+
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'period_id': fields.many2one('stock.period' , 'Period', required=True, help = 'Period which planning will concern.'),
+        'warehouse_id': fields.many2one('stock.warehouse' , 'Warehouse', required=True, help = 'Warehouse which planning will concern.'),
+        'product_categ_id': fields.many2one('product.category' , 'Product Category', \
+                        help = 'Planning will be created for products from Product Category selected by this field. '\
+                               'This field is ignored when you check \"All Forecasted Product\" box.' ),
+        'forecasted_products': fields.boolean('All Products with Forecast', \
+                     help = "Check this box to create planning for all products having any forecast for selected Warehouse and Period. "\
+                            "Product Category field will be ignored."),
+    }
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.planning', context=c),
+    }
+
+    def create_planning(self,cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        product_obj = self.pool.get('product.product')
+        planning_obj = self.pool.get('stock.planning')
+        mod_obj = self.pool.get('ir.model.data')
+        prod_categ_obj = self.pool.get('product.category')
+        template_obj = self.pool.get('product.template')
+        planning_lines = []
+        for f in self.browse(cr, uid, ids, context=context):
+            if f.forecasted_products:
+                cr.execute("SELECT product_id \
+                                FROM stock_sale_forecast \
+                                WHERE (period_id = %s) AND (warehouse_id = %s)", (f.period_id2.id, f.warehouse_id2.id))
+                products_id1 = [x for x, in cr.fetchall()]
+            else:
+                categ_ids = f.product_categ_id.id and [f.product_categ_id.id] or []
+                prod_categ_ids = prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)])
+                templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)])
+                products_id1 = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)])
+            if len(products_id1)==0:
+                raise osv.except_osv(_('Error !'), _('No forecasts for selected period or no products in selected category !'))
+
+            for p in product_obj.browse(cr, uid, products_id1,context=context):
+                if len(planning_obj.search(cr, uid, [('product_id','=',p.id),
+                                                      ('period_id','=',f.period_id.id),
+                                                      ('warehouse_id','=',f.warehouse_id.id)]))== 0:
+                    cr.execute("SELECT period.date_stop, planning.product_uom, planning.planned_outgoing, planning.to_procure, \
+                                    planning.stock_only, planning.procure_to_stock, planning.confirmed_forecasts_only, \
+                                    planning.supply_warehouse_id, planning.stock_supply_location \
+                                FROM stock_planning AS planning \
+                                LEFT JOIN stock_period AS period \
+                                ON planning.period_id = period.id \
+                                WHERE (planning.create_uid = %s OR planning.write_uid = %s) \
+                                     AND planning.warehouse_id = %s AND planning.product_id = %s \
+                                     AND period.date_stop < %s \
+                                ORDER BY period.date_stop DESC",
+                                    (uid, uid, f.warehouse_id.id, p.id, f.period_id.date_stop) )
+                    ret=cr.fetchone()
+#                        forecast_qty = ret and ret[0] or 0.0
+                    if ret:
+#                            raise osv.except_osv(_('Error !'), _('ret is %s %s %s %s %s %s')%(ret[0],ret[2],ret[3],ret[4],ret[5],ret[6],))
+                        prod_uom = ret[1]
+                        planned_out = ret[2]
+                        to_procure = ret[3]
+                        stock_only = ret[4]
+                        procure_to_stock = ret[5]
+                        confirmed_forecasts_only = ret[6]
+                        supply_warehouse_id = ret[7]
+                        stock_supply_location = ret[8]
+                    else:
+                        prod_uom = p.uom_id.id
+                        planned_out = False
+                        to_procure = False
+                        stock_only = False
+                        procure_to_stock = False
+                        confirmed_forecasts_only = False
+                        supply_warehouse_id = False
+                        stock_supply_location = False
+                    prod_uos_categ = False
+                    if p.uos_id:
+                        prod_uos_categ = p.uos_id.category_id.id
+                    planning_lines.append(planning_obj.create(cr, uid, {
+                        'company_id' : f.warehouse_id.company_id.id,
+                        'period_id': f.period_id.id,
+                        'warehouse_id' : f.warehouse_id.id,
+                        'product_id': p.id,
+                        'product_uom' : prod_uom,
+                        'product_uom_categ' : p.uom_id.category_id.id,
+                        'product_uos_categ' : prod_uos_categ,
+                        'active_uom' : prod_uom,
+                        'planned_outgoing': planned_out,
+                        'to_procure': to_procure,
+                        'stock_only': stock_only,
+                        'procure_to_stock': procure_to_stock,
+                        'confirmed_forecasts_only': confirmed_forecasts_only,
+                        'supply_warehouse_id': supply_warehouse_id,
+                        'stock_supply_location': stock_supply_location,
+
+                    }))
+        result = mod_obj._get_id(cr, uid, 'stock_planning', 'view_stock_planning_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
+        
+        return {
+                'domain': "[('id','in', ["+','.join(map(str, planning_lines))+"])]",
+                'view_type': 'form',
+                "view_mode": 'tree, form',
+                'res_model': 'stock.planning',
+                'type': 'ir.actions.act_window',
+                'search_view_id': id['res_id'],
+        }
+
+stock_planning_createlines()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
new file mode 100644
index 00000000000..7dc4504daef
--- /dev/null
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+            
+        <!-- Create Planning section -->
+        
+        <record id="view_stock_planning_createlines_form" model="ir.ui.view">
+            <field name="name">stock.planning.createlines.form</field>
+            <field name="model">stock.planning.createlines</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Stock Planning Lines">
+                    <separator colspan ="4" string="Creates planning lines for selected period and warehouse."/>
+                    <field name="period_id" widget="selection"/>
+                    <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
+                    <field name="forecasted_products"/>
+                    <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
+                    <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
+                    <newline/>
+                    <label colspan ="4"  string="Note: Doesn't duplicate existing lines created by you."/>
+                    <separator colspan="4"/>
+                    <group colspan="4">
+                        <button icon="gtk-cancel" special="cancel" string="Close"/>
+                        <button icon="gtk-ok" name="create_planning" string="Create" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_stock_planning_createlines_form" model="ir.actions.act_window">
+            <field name="name">Create Stock Planning Lines</field>
+            <field name="res_model">stock.planning.createlines</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_stock_planning_createlines_form"/>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            id="menu_stock_planning_createlines"
+            parent="menu_stock_planning_main"
+            action="action_stock_planning_createlines_form" sequence = "5"/>
+    </data>
+</openerp>
diff --git a/addons/stock_planning/wizard/stock_planning_forecast.py b/addons/stock_planning/wizard/stock_planning_forecast.py
new file mode 100644
index 00000000000..b261d8ffc72
--- /dev/null
+++ b/addons/stock_planning/wizard/stock_planning_forecast.py
@@ -0,0 +1,123 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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, fields
+
+# Creates forecasts records for products from selected Product Category for selected 'Warehouse - Period'
+# Object added by contributor in ver 1.1
+class stock_sale_forecast_createlines(osv.osv_memory):
+    _name = "stock.sale.forecast.createlines"
+    _description = "stock.sale.forecast.createlines"
+
+# FIXME Add some period sugestion like below
+
+#    def _get_latest_period(self,cr,uid,context={}):
+#        cr.execute("select max(date_stop) from stock_period")
+#        result=cr.fetchone()
+#        return result and result[0] or False
+
+
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required=True, select=1),
+        'warehouse_id': fields.many2one('stock.warehouse' , 'Warehouse', required=True, \
+                                help='Warehouse which forecasts will concern. '\
+                                   'If during stock planning you will need sales forecast for all warehouses choose any warehouse now.'),
+        'period_id': fields.many2one('stock.period' , 'Period', required=True, help = 'Period which forecasts will concern.' ),
+        'product_categ_id': fields.many2one('product.category' , 'Product Category', required=True, \
+                                help ='Product Category of products which created forecasts will concern.'),
+        'copy_forecast': fields.boolean('Copy Last Forecast', help="Copy quantities from last Stock and Sale Forecast."),
+                }
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.sale.forecast.createlines', context=c),
+    }
+
+    def create_forecast(self, cr, uid, ids, context=None):
+        product_obj = self.pool.get('product.product')
+        forecast_obj = self.pool.get('stock.sale.forecast')
+        mod_obj = self.pool.get('ir.model.data')
+        prod_categ_obj = self.pool.get('product.category')
+        template_obj = self.pool.get('product.template')
+        forecast_lines = []
+        for f in self.browse(cr, uid, ids, context=context):
+            categ_ids =  f.product_categ_id.id and [f.product_categ_id.id] or []
+            prod_categ_ids = prod_categ_obj.search(cr, uid, [('parent_id','child_of', categ_ids)])
+            templates_ids = template_obj.search(cr, uid, [('categ_id','in',prod_categ_ids)])
+            products_ids = product_obj.search(cr, uid, [('product_tmpl_id','in',templates_ids)])
+            if len(products_ids) == 0:
+                raise osv.except_osv(_('Error !'), _('No products in selected category !'))
+            copy = f.copy_forecast
+            for p in product_obj.browse(cr, uid, products_ids,{}):
+                if len(forecast_obj.search(cr, uid, [('product_id','=',p.id) , \
+                                                       ('period_id','=',f.period_id.id), \
+                                                       ('user_id','=',uid), \
+                                                       ('warehouse_id','=',f.warehouse_id.id)]))== 0:
+                    forecast_qty = 0.0
+# Not sure if it is expected quantity for this feature (copying forecast from previous period)
+# because it can take incidental forecast of this warehouse, this product and this user (creating, writing or validating forecast).
+# It takes only one forecast line (no sum). If user creates only one forecast per period it will be OK. If not I have no idea how to count it.
+
+                    prod_uom = False
+                    if copy:
+                        cr.execute("SELECT period.date_stop, forecast.product_qty, forecast.product_uom \
+                                    FROM stock_sale_forecast AS forecast \
+                                    LEFT JOIN stock_period AS period \
+                                    ON forecast.period_id = period.id \
+                                    WHERE (forecast.user_id = %s OR forecast.create_uid = %s OR forecast.write_uid = %s) \
+                                        AND forecast.warehouse_id = %s AND forecast.product_id = %s \
+                                        AND period.date_stop < %s \
+                                    ORDER BY period.date_stop DESC",
+                                    (uid, uid, uid, f.warehouse_id.id, p.id, f.period_id.date_stop) )
+                        ret = cr.fetchone()
+                        if ret:
+                            forecast_qty = ret[1]
+                            prod_uom = ret[2]
+                    prod_uom = prod_uom or p.uom_id.id
+                    prod_uos_categ = False
+                    if p.uos_id:
+                        prod_uos_categ = p.uos_id.category_id.id
+                    forecast_lines.append(forecast_obj.create(cr, uid, {
+                        'company_id': f.warehouse_id.company_id.id,
+                        'period_id': f.period_id.id,
+                        'warehouse_id': f.warehouse_id.id,
+                        'product_id': p.id,
+                        'product_qty': forecast_qty,
+                        'product_amt': 0.0,
+                        'product_uom': prod_uom,
+                        'active_uom': prod_uom,
+                        'product_uom_categ': p.uom_id.category_id.id,
+                        'product_uos_categ': prod_uos_categ,
+                     }))
+        result = mod_obj._get_id(cr, uid, 'stock_planning', 'view_stock_sale_forecast_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
+
+        return {
+                'domain': "[('id','in', ["+','.join(map(str, forecast_lines))+"])]",
+                'view_type': 'form',
+                "view_mode": 'tree, form',
+                'res_model': 'stock.sale.forecast',
+                'type': 'ir.actions.act_window',
+                'search_view_id': id['res_id'],
+            }
+
+stock_sale_forecast_createlines()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
new file mode 100644
index 00000000000..9b87b5cdffd
--- /dev/null
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+            
+        <!--   Create Forecast section   -->
+
+        <record id="view_stock_sale_forecast_createlines_form" model="ir.ui.view">
+            <field name="name">stock.sale.forecast.createlines</field>
+            <field name="model">stock.sale.forecast.createlines</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Forecasts Lines">
+                    <separator colspan ="4" string="Creates forecast lines for selected warehouse and period."/>
+                    <field name="period_id"/>
+                    <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
+                    <field name="copy_forecast"/>
+                    <field name="product_categ_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <newline/>
+                    <label colspan ="4" string="Note: Doesn't duplicate existing lines created by you."/>
+                    <separator colspan ="4" />
+                    <group colspan="4">
+                        <button icon="gtk-cancel"  special="cancel" string="Close"/>
+                        <button icon="gtk-execute" name="create_forecast" string="Create" type="object" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_stock_sale_forecast_createlines_form" model="ir.actions.act_window">
+            <field name="name">Create Sales Forecasts</field>
+            <field name="res_model">stock.sale.forecast.createlines</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_stock_sale_forecast_createlines_form"/>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem id="menu_stock_sale_forecast_createlines" name="Create Sales Forecasts" 
+                parent="menu_stock_sale_forecast" action="action_stock_sale_forecast_createlines_form" sequence="5"/>
+
+    </data>
+</openerp>
+
+        
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index c67ba98d454..d85a943f9bf 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Others',
     'description': """Module allows to create new documents and add subscription on that document.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base'],
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv', 'subscription_view.xml'],
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 47840d7082f..3d1cb78230f 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -30,7 +30,7 @@
     Different users may give different answers of question and according to that survey is done. 
     Partners are also sent mails with user name and password for the invitation of the survey
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base'],
     'update_xml': ['survey_report.xml',
                    'survey_data.xml',
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 8cac202fe40..a78fe55ea2d 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -124,7 +124,6 @@ class survey(osv.osv):
                 'type': 'ir.actions.report.xml',
                 'report_name': 'survey.browse.response',
                 'datas': datas,
-                'nodestroy': True,
                 'context' : context
             }
         else:
@@ -135,7 +134,6 @@ class survey(osv.osv):
                 'type': 'ir.actions.report.xml',
                 'report_name': 'survey.form',
                 'datas': datas,
-                'nodestroy':True,
                 'context' : context
             }
         return report
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 68e6c1e9883..43db63e982b 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -388,7 +388,7 @@
         </record>
         <record id="survey_answer_converted_in_customers" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
-            <field name="answer">How are the leads that you find thanks to Tiny be converted in customers?</field>
+            <field name="answer">How are the leads that you find thanks to OpenERP SA be converted in customers?</field>
             <field name="question_id" ref="survey_question_Leads" />
             <field name="sequence" eval="2"/>
         </record>
@@ -425,7 +425,7 @@
 
         <record id="survey_question_partners_about" model="survey.question">
             <field name="in_visible_answer_type">1</field>
-            <field name="question">How is Tiny's communication with partners about...</field>
+            <field name="question">How is OpenERP SA's communication with partners about...</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">matrix_of_choices_only_one_ans</field>
             <field name="in_visible_single_text">1</field>
@@ -482,7 +482,7 @@
 
         <record id="survey_question_partners_on_which_subjects" model="survey.question">
             <field name="in_visible_answer_type">1</field>
-            <field name="question">In your opinion, how could Tiny better communicate with partners and on which subjects?</field>
+            <field name="question">In your opinion, how could OpenERP SA better communicate with partners and on which subjects?</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">comment</field>
             <field name="in_visible_rating_weight">1</field>
@@ -2830,9 +2830,9 @@
             <field eval="8" name="sequence"/>
         </record>
     </data>
-    
+
     <!--  Survey Response -->
-    
+
     <data noupdate="1">
         <record id="survey_history_0" model="survey.history">
             <field name="date">2010-03-03 14:25:03</field>
@@ -2902,7 +2902,7 @@
             <field name="date_create">2010-03-03 14:25:03.706175</field>
             <field name="state">done</field>
             <field name="response_id" ref="survey_response_0"/>
-            <field name="single_text">Tiny ERP</field>
+            <field name="single_text">OpenERP SA</field>
             <field name="question_id" ref="survey.survey_question_company_name"/>
         </record>
     </data>
@@ -2983,7 +2983,7 @@
             <field name="date_create">2010-03-03 14:29:36.33203</field>
             <field name="state">done</field>
             <field name="response_id" ref="survey_response_1"/>
-            <field name="single_text">Tiny ERP</field>
+            <field name="single_text">OpenERP SA</field>
             <field name="question_id" ref="survey.survey_question_odoo_company_name"/>
         </record>
     </data>
diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index e9b6e6238bb..18db70b99b9 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -54,7 +54,7 @@ class tinythunderbird_partner(osv.osv):
                  'date': lambda *a: time.strftime('%Y-%m-%d')
                  }
 
-    def thunderbird_mailcreate(self,cr,user,vals):
+    def thunderbird_mailcreate(self,cr,user,vals):
         dictcreate = dict(vals)
         import email
         header_name = email.Header.decode_header(dictcreate['name'])
@@ -62,7 +62,7 @@ class tinythunderbird_partner(osv.osv):
         add_obj=self.pool.get('res.partner.address')
         case_pool=self.pool.get(dictcreate.get('object','crm.lead'))
         partner_ids=add_obj.search(cr,user,[('email','=',dictcreate['email_from'])])
-        partner=add_obj.read(cr,user,partner_ids,['partner_id','name'])
+        partner=add_obj.read(cr,user,partner_ids,['partner_id','name'])
         if partner and partner[0] and partner[0]['partner_id']:
             dictcreate.update({'partner_id':partner[0]['partner_id'][0],'partner_name':partner[0]['name']})
         create_id = case_pool.create(cr, user, dictcreate)
@@ -81,20 +81,20 @@ class tinythunderbird_partner(osv.osv):
         res = {}
         if partner:
             partner=partner[0]
-            test = address_obj.read(cr,user, partner)
+            data = address_obj.read(cr,user, partner)
             res = {
-                'partner_name': test['partner_id'] and test['partner_id'][1] or '',
-                'contactname': test['name'] or '',
-                'street': test['street'] or '',
-                'street2': test['street2'] or '',
-                'zip': test['zip'] or '',
-                'city': test['city'] or '',
-                'country': test['country_id'] and test['country_id'][0] or '',
-                'state': test['state_id'] and test['state_id'][0] or '',
-                'email': test['email'] or '',
-                'phone': test['phone'] or '',
-                'mobile': test['mobile'] or '',
-                'fax': test['fax'] or '',
+                'partner_name': data['partner_id'] and data['partner_id'][1] or '',
+                'contactname': data['name'] or '',
+                'street': data['street'] or '',
+                'street2': data['street2'] or '',
+                'zip': data['zip'] or '',
+                'city': data['city'] or '',
+                'country': data['country_id'] and data['country_id'][1] or '',
+                'state': data['state_id'] and data['state_id'][1] or '',
+                'email': data['email'] or '',
+                'phone': data['phone'] or '',
+                'mobile': data['mobile'] or '',
+                'fax': data['fax'] or '',
                 'res_id': str(partner),
             }
         return res.items()
@@ -123,7 +123,6 @@ class tinythunderbird_partner(osv.osv):
                                'email': dictcreate['email'],
                                }
         add_obj.write(cr, user,res_id,result )
-
         return True
 
     def thunderbird_createpartner(self,cr,user,vals):
@@ -133,7 +132,7 @@ class tinythunderbird_partner(osv.osv):
         if search_id:
             return 0
         create_id = address_obj.create(cr, user, dictcreate)
-        return create_id
+        return create_id
 
     def thunderbird_searchobject(self,cr,user,vals):
         dictcreate = dict(vals)
@@ -181,7 +180,7 @@ class tinythunderbird_partner(osv.osv):
             name_get.append('error')
             name_get.append(er_val)
         return name_get
-
+
     def thunderbird_attachment(self,cr,user,vals):
         dictcreate = dict(vals)
         datas = [dictcreate['datas']]
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index b4dbfb19a57..f03d5e37c27 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -22,7 +22,7 @@
     "name" : "Authenticate users with ldap server",
     "version" : "0.1",
     "depends" : ["base"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "description": """Adds support for authentication by ldap server""",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Others",
diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py
index ccbd2db9772..af10eb968a5 100644
--- a/addons/warning/__openerp__.py
+++ b/addons/warning/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Tools',
     'description': """Module for Warnings form onchange Event.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base', 'sale', 'purchase'],
     'update_xml': ['warning_view.xml'],
     'demo_xml': [],
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 0aec93f1c90..4f7b7fcc8d2 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -114,7 +114,7 @@ purchase_order()
 class account_invoice(osv.osv):
     _inherit = 'account.invoice'
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank=False, company_id=False):
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         if not partner_id:
             return {'value': {
             'address_contact_id': False ,
@@ -138,7 +138,7 @@ class account_invoice(osv.osv):
                 'message': message
                 }
         result =  super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank=False)
+            date_invoice=False, payment_term=False, partner_bank_id=False)
 
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index d5c5cc16b30..bccd2fc5c3f 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -28,7 +28,7 @@ The base module to manage documents(wiki)
 
 keep track for the wiki groups, pages, and history
     """,
-    'author': 'Tiny & Axelor',
+    'author': 'OpenERP SA & Axelor',
     'website': 'http://openerp.com',
     'depends': ['knowledge'],
     'web_depends': ['widget_wiki'],
diff --git a/addons/wiki/i18n/lt.po b/addons/wiki/i18n/lt.po
index 967ef779fe4..9b791d58c02 100644
--- a/addons/wiki/i18n/lt.po
+++ b/addons/wiki/i18n/lt.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* wiki
-#
+# * wiki
+# giedrius <giedrius.slavinskas@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"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"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-07-20 22:14+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-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: lt\n"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
@@ -26,64 +27,66 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Objekto pavadinimas turi prasidėti x_ ir negali turėti jokių specialiųjų "
+"ženklų !"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_groups_link
 msgid "Wiki Groups Links"
-msgstr ""
+msgstr "Wiki grupių nuorodos"
 
 #. module: wiki
 #: field:wiki.wiki,create_uid:0
 msgid "Author"
-msgstr ""
+msgstr "Autorius"
 
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_open_page
 msgid "Open Page"
-msgstr ""
+msgstr "Atidaryti puslapį"
 
 #. module: wiki
 #: field:wiki.groups.link,action_id:0
 msgid "Menu"
-msgstr ""
+msgstr "Meniu"
 
 #. module: wiki
 #: field:wiki.groups,child_ids:0
 msgid "Child Groups"
-msgstr ""
+msgstr "Žemesnės grupės"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 #: model:ir.actions.act_window,name:wiki.action_wiki
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
 msgid "Wiki Pages"
-msgstr ""
+msgstr "Wiki puslapiai"
 
 #. module: wiki
 #: field:wiki.groups,section:0
 msgid "Make Section ?"
-msgstr ""
+msgstr "Suskirstyti?"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history
 #: view:wiki.wiki.history:0
 msgid "Wiki History"
-msgstr ""
+msgstr "Wiki istorija"
 
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
 msgid "Minor edit"
-msgstr ""
+msgstr "Smulkus keitimas"
 
 #. module: wiki
 #: field:wiki.wiki,text_area:0
 msgid "Content"
-msgstr ""
+msgstr "Turinys"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document_configuration
 msgid "Wiki Configuration"
-msgstr ""
+msgstr "Wiki konfigūracija"
 
 #. module: wiki
 #: constraint:ir.actions.act_window:0
@@ -94,204 +97,204 @@ msgstr ""
 #: field:wiki.groups,name:0
 #: field:wiki.wiki,group_id:0
 msgid "Wiki Group"
-msgstr ""
+msgstr "Wiki grupė"
 
 #. module: wiki
 #: field:wiki.wiki,name:0
 msgid "Title"
-msgstr ""
+msgstr "Antraštė"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
 msgid "History Lines"
-msgstr ""
+msgstr "Istorijos eilutės"
 
 #. module: wiki
 #: field:wiki.groups,template:0
 msgid "Wiki Template"
-msgstr ""
+msgstr "Viki šablonas"
 
 #. module: wiki
 #: model:ir.module.module,shortdesc:wiki.module_meta_information
 msgid "Document Management - Wiki"
-msgstr ""
+msgstr "Dokumentų valdymas - Wiki"
 
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Create a Menu"
-msgstr ""
+msgstr "Sukurti meniu"
 
 #. module: wiki
 #: field:wiki.groups,notes:0
 msgid "Description"
-msgstr ""
+msgstr "Aprašas"
 
 #. module: wiki
 #: field:wiki.wiki,section:0
 msgid "Section"
-msgstr ""
+msgstr "Sekcija"
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "History Differance"
-msgstr ""
+msgstr "Istorijos skirtumas"
 
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,page:0
 msgid "Group Home Page"
-msgstr ""
+msgstr "Grupuoti puslapius"
 
 #. module: wiki
 #: field:wiki.wiki,write_uid:0
 msgid "Last Author"
-msgstr ""
+msgstr "Paskutinis autorius"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_view_diff
 msgid "Differences"
-msgstr ""
+msgstr "Skirtumai"
 
 #. module: wiki
 #: help:wiki.wiki,section:0
 msgid "Use page section code like 1.2.1"
-msgstr ""
+msgstr "Naudoti puslapių sekcijos kodą kaip 1.2.1"
 
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Page Template"
-msgstr ""
+msgstr "Puslapio šablonas"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document2
 msgid "Document Management"
-msgstr ""
+msgstr "Dokumentų valdymas"
 
 #. module: wiki
 #: field:wiki.wiki.history,create_date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: wiki
 #: wizard_view:wiki.make.index,init:0
 msgid "Want to create a Index on Selected Pages ? "
-msgstr ""
+msgstr "Norite sukurti nuorodą į pasirinktus puslapius? "
 
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Configuration"
-msgstr ""
+msgstr "Nustatymai"
 
 #. module: wiki
 #: field:wiki.groups,home:0
 #: field:wiki.groups,page_ids:0
 msgid "Pages"
-msgstr ""
+msgstr "Puslapiai"
 
 #. module: wiki
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Netinkamas XML peržiūros struktūrai!"
 
 #. module: wiki
 #: field:wiki.wiki.history,text_area:0
 msgid "Text area"
-msgstr ""
+msgstr "Tekstas"
 
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Bazinis meniu"
 
 #. module: wiki
 #: field:wiki.wiki,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "Sukurta"
 
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Notes"
-msgstr ""
+msgstr "Pastabos"
 
 #. module: wiki
 #: wizard_view:wiki.create.menu,init:0
 #: wizard_view:wiki.make.index,init:0
 msgid "Menu Information"
-msgstr ""
+msgstr "Meniu informacija"
 
 #. module: wiki
 #: field:wiki.groups,parent_id:0
 #: field:wiki.groups.link,group_id:0
 msgid "Parent Group"
-msgstr ""
+msgstr "Tėvinė grupė"
 
 #. module: wiki
 #: field:wiki.wiki,summary:0
 #: field:wiki.wiki.history,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Santrauka"
 
 #. module: wiki
 #: field:wiki.groups,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Sukūrimo data"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_history
 #: model:ir.ui.menu,name:wiki.menu_action_history
 msgid "All Page Histories"
-msgstr ""
+msgstr "Visos puslapių istorijos"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki
 msgid "wiki.wiki"
-msgstr ""
+msgstr "Wiki"
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "Wiki Differance"
-msgstr ""
+msgstr "Wiki skirtumas"
 
 #. module: wiki
 #: field:wiki.wiki.history,wiki_id:0
 msgid "Wiki Id"
-msgstr ""
+msgstr "Wiki ID"
 
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Meniu pavadinimas"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modifications"
-msgstr ""
+msgstr "Pakeitimai"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "History"
-msgstr ""
+msgstr "Istorija"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document
 #: view:wiki.wiki:0
 msgid "Wiki"
-msgstr ""
+msgstr "Wiki"
 
 #. module: wiki
 #: field:wiki.wiki,write_date:0
 msgid "Modification Date"
-msgstr ""
+msgstr "Modifikavimo data"
 
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_make_index
 #: wizard_button:wiki.make.index,init,yes:0
 msgid "Create Index"
-msgstr ""
+msgstr "Sukurti nuorodą"
 
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr ""
+msgstr "Tai yra svarbesnis keitimas?"
 
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_group_menu_create
@@ -299,12 +302,12 @@ msgstr ""
 #: wizard_button:wiki.create.menu,init,create_menu:0
 #: wizard_view:wiki.make.index,init:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Sukurti meniu"
 
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Tags"
-msgstr ""
+msgstr "Gairės"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -314,30 +317,34 @@ msgstr ""
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_groups_browse
 #: view:wiki.groups:0
 msgid "Wiki Groups"
-msgstr ""
+msgstr "Wiki grupės"
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
 msgid "Modify By"
-msgstr ""
+msgstr "Pakeistas"
 
 #. module: wiki
 #: field:wiki.wiki,toc:0
 msgid "Table of Contents"
-msgstr ""
+msgstr "Lentelės turinys"
 
 #. module: wiki
 #: wizard_button:wiki.create.menu,init,end:0
 #: wizard_button:wiki.make.index,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 #. module: wiki
 #: field:wizard.wiki.history.show_diff,diff:0
 msgid "Diff"
-msgstr ""
+msgstr "Skirtumas"
 
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Need Review"
-msgstr ""
+msgstr "Reikalinga peržiūra"
+
+#, python-format
+#~ msgid "No action found"
+#~ msgstr "Veiksmas nerastas"
diff --git a/addons/wiki/i18n/pl.po b/addons/wiki/i18n/pl.po
index f626f87107f..4157d7c4f7f 100644
--- a/addons/wiki/i18n/pl.po
+++ b/addons/wiki/i18n/pl.po
@@ -7,13 +7,13 @@ 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"
-"PO-Revision-Date: 2009-09-08 12:13+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-07-26 19:55+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-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-07-27 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -37,12 +37,12 @@ msgstr ""
 #. module: wiki
 #: field:wiki.wiki,create_uid:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_open_page
 msgid "Open Page"
-msgstr ""
+msgstr "Otwórz stronę"
 
 #. module: wiki
 #: field:wiki.groups.link,action_id:0
@@ -52,66 +52,66 @@ msgstr ""
 #. module: wiki
 #: field:wiki.groups,child_ids:0
 msgid "Child Groups"
-msgstr ""
+msgstr "Grupy podrzędne"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 #: model:ir.actions.act_window,name:wiki.action_wiki
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
 msgid "Wiki Pages"
-msgstr ""
+msgstr "Strony Wiki"
 
 #. module: wiki
 #: field:wiki.groups,section:0
 msgid "Make Section ?"
-msgstr ""
+msgstr "Utworzyć sekcję ?"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history
 #: view:wiki.wiki.history:0
 msgid "Wiki History"
-msgstr ""
+msgstr "Historia wiki"
 
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
 msgid "Minor edit"
-msgstr ""
+msgstr "Drobna edycja"
 
 #. module: wiki
 #: field:wiki.wiki,text_area:0
 msgid "Content"
-msgstr ""
+msgstr "Zawartość"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document_configuration
 msgid "Wiki Configuration"
-msgstr ""
+msgstr "Konfiguracja wiki"
 
 #. module: wiki
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: wiki
 #: field:wiki.groups,name:0
 #: field:wiki.wiki,group_id:0
 msgid "Wiki Group"
-msgstr ""
+msgstr "Grupa wiki"
 
 #. module: wiki
 #: field:wiki.wiki,name:0
 msgid "Title"
-msgstr ""
+msgstr "Tytuł"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
 msgid "History Lines"
-msgstr ""
+msgstr "Pozycje historii"
 
 #. module: wiki
 #: field:wiki.groups,template:0
 msgid "Wiki Template"
-msgstr ""
+msgstr "Szablon wiki"
 
 #. module: wiki
 #: model:ir.module.module,shortdesc:wiki.module_meta_information
@@ -121,17 +121,17 @@ msgstr ""
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Create a Menu"
-msgstr ""
+msgstr "Utwórz menu"
 
 #. module: wiki
 #: field:wiki.groups,notes:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: wiki
 #: field:wiki.wiki,section:0
 msgid "Section"
-msgstr ""
+msgstr "Sekcja"
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
@@ -146,12 +146,12 @@ msgstr ""
 #. module: wiki
 #: field:wiki.wiki,write_uid:0
 msgid "Last Author"
-msgstr ""
+msgstr "Ostatni autor"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_view_diff
 msgid "Differences"
-msgstr ""
+msgstr "Różnice"
 
 #. module: wiki
 #: help:wiki.wiki,section:0
@@ -161,17 +161,17 @@ msgstr ""
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Page Template"
-msgstr ""
+msgstr "Szablon strony"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document2
 msgid "Document Management"
-msgstr ""
+msgstr "Zarządzanie dokumentami"
 
 #. module: wiki
 #: field:wiki.wiki.history,create_date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: wiki
 #: wizard_view:wiki.make.index,init:0
@@ -181,13 +181,13 @@ msgstr ""
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracja"
 
 #. module: wiki
 #: field:wiki.groups,home:0
 #: field:wiki.groups,page_ids:0
 msgid "Pages"
-msgstr ""
+msgstr "Strony"
 
 #. module: wiki
 #: constraint:ir.ui.view:0
@@ -197,22 +197,22 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 #. module: wiki
 #: field:wiki.wiki.history,text_area:0
 msgid "Text area"
-msgstr ""
+msgstr "Obszar tekstu"
 
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Menu nadrzędne"
 
 #. module: wiki
 #: field:wiki.wiki,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "Utworzono"
 
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Notes"
-msgstr ""
+msgstr "Uwagi"
 
 #. module: wiki
 #: wizard_view:wiki.create.menu,init:0
@@ -224,18 +224,18 @@ msgstr ""
 #: field:wiki.groups,parent_id:0
 #: field:wiki.groups.link,group_id:0
 msgid "Parent Group"
-msgstr ""
+msgstr "Grupa nadrzędna"
 
 #. module: wiki
 #: field:wiki.wiki,summary:0
 #: field:wiki.wiki.history,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Podsumowanie"
 
 #. module: wiki
 #: field:wiki.groups,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_history
@@ -261,17 +261,17 @@ msgstr ""
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Nazwa menu"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modifications"
-msgstr ""
+msgstr "Modyfikacje"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document
@@ -282,18 +282,18 @@ msgstr ""
 #. module: wiki
 #: field:wiki.wiki,write_date:0
 msgid "Modification Date"
-msgstr ""
+msgstr "Data modyfikacji"
 
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_make_index
 #: wizard_button:wiki.make.index,init,yes:0
 msgid "Create Index"
-msgstr ""
+msgstr "Utwórz indeks"
 
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr ""
+msgstr "Czy jest to większa edycja ?"
 
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_group_menu_create
@@ -301,12 +301,12 @@ msgstr ""
 #: wizard_button:wiki.create.menu,init,create_menu:0
 #: wizard_view:wiki.make.index,init:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Utwórz menu"
 
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Tags"
-msgstr ""
+msgstr "Znaczniki"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -316,7 +316,7 @@ msgstr ""
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_groups_browse
 #: view:wiki.groups:0
 msgid "Wiki Groups"
-msgstr ""
+msgstr "Grupy wiki"
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
@@ -326,20 +326,20 @@ msgstr ""
 #. module: wiki
 #: field:wiki.wiki,toc:0
 msgid "Table of Contents"
-msgstr ""
+msgstr "Spis treści"
 
 #. module: wiki
 #: wizard_button:wiki.create.menu,init,end:0
 #: wizard_button:wiki.make.index,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 #. module: wiki
 #: field:wizard.wiki.history.show_diff,diff:0
 msgid "Diff"
-msgstr ""
+msgstr "Różnice"
 
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Need Review"
-msgstr ""
+msgstr "Wymaga przejrzenia"
diff --git a/addons/wiki/i18n/sr.po b/addons/wiki/i18n/sr.po
index ebbf11a1979..d5d7a8f9c71 100644
--- a/addons/wiki/i18n/sr.po
+++ b/addons/wiki/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:13+0000\n"
-"Last-Translator: Dragan Životić <dragan_zivotic@yahoo.com>\n"
+"PO-Revision-Date: 2010-07-21 08:12+0000\n"
+"Last-Translator: novta <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-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -90,7 +90,7 @@ msgstr "Wiki Konfiguracija"
 #. module: wiki
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: wiki
 #: field:wiki.groups,name:0
diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py
index 7716ba015fe..9f7f4e139b4 100644
--- a/addons/wiki_faq/__openerp__.py
+++ b/addons/wiki_faq/__openerp__.py
@@ -25,7 +25,7 @@
     'category': 'Generic Modules/Others',
     'description': """This module provides a wiki FAQ Template
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['wiki'],
     'init_xml': [],
diff --git a/addons/wiki_quality_manual/__openerp__.py b/addons/wiki_quality_manual/__openerp__.py
index 9729c4c4910..5e1e0200fbe 100644
--- a/addons/wiki_quality_manual/__openerp__.py
+++ b/addons/wiki_quality_manual/__openerp__.py
@@ -25,7 +25,7 @@
     'category': 'Generic Modules/Others',
     'description': """Quality Manual Template
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['wiki'],
     'init_xml': [],
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
index 9619ec98f15..3270275bff8 100644
--- a/addons/wiki_sale_faq/__openerp__.py
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -25,7 +25,7 @@
     'category': 'Generic Modules/Others',
     'description': """This module provides a wiki FAQ Template
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['wiki_faq','document','crm'],
     'init_xml': [
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
index a97ba15db0e..f65e542aed9 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
@@ -8,20 +8,23 @@
            parent="base.menu_base_partner"/>
 
        <record model="ir.actions.act_window" id="action_document_form">
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">ir.attachment</field>
-        <field name="view_type">form</field>
-        <field name="domain" eval="[('parent_id','=',ref('dir_sale'))]"></field>
-    </record>
+           <field name="name">Documents</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">ir.attachment</field>
+           <field name="view_type">form</field>
+           <field name="domain" eval="[('parent_id','=',ref('dir_sale'))]"></field>
+           <field name="help">Documents give your access to all attached documents; it's a repository of all attached documents (mails, documents attached to a project, etc.)</field>
+       </record>
 
-         <record model="ir.actions.act_window" id="action_wiki_test">
-            <field name="name">Wiki Pages</field>
-            <field name="res_model">wiki.wiki</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain" eval="[('group_id','=',ref('wiki_groups_sale_faq'))]"/>
-            <field name="search_view_id" ref="wiki.view_wiki_filter"/>
-        </record>
+       <record model="ir.actions.act_window" id="action_wiki_test">
+           <field name="name">Wiki Pages</field>
+           <field name="res_model">wiki.wiki</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+           <field name="domain" eval="[('group_id','=',ref('wiki_groups_sale_faq'))]"/>
+           <field name="search_view_id" ref="wiki.view_wiki_filter"/>
+           <field name="help">FAQ is a wiki page used to share frequently ask questions.</field>
+       </record>
 
         <menuitem
         name="Documents"